From 0440073853d7530ae605d56f3ba1e4a27c3200d5 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 23 May 2017 22:28:45 +0300
Subject: [PATCH 01/94] restore style code in popup::onMessage

---
 popup.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/popup.js b/popup.js
index 9ac807be..fde184bf 100644
--- a/popup.js
+++ b/popup.js
@@ -22,7 +22,9 @@ function onRuntimeMessage(msg) {
   switch (msg.method) {
     case 'styleAdded':
     case 'styleUpdated':
-      handleUpdate(msg.style);
+      // notifyAllTabs sets msg.style's code to null so we have to get the actual style
+      // because we analyze its code in detectSloppyRegexps
+      handleUpdate(BG.cachedStyles.byId.get(msg.style.id));
       break;
     case 'styleDeleted':
       handleDelete(msg.id);

From 26f84c5852638fb52daf4a4a898d62de4a3157b6 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 23 May 2017 22:31:40 +0300
Subject: [PATCH 02/94] play safe in *Safe() as BG gets defined only in .then

---
 messaging.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/messaging.js b/messaging.js
index 063f4a2a..c11e1f4c 100644
--- a/messaging.js
+++ b/messaging.js
@@ -272,13 +272,13 @@ function sessionStorageHash(name) {
 }
 
 
-function onBackgroundReady(...dataPassthru) {
-  return BG ? Promise.resolve(...dataPassthru) : new Promise(ping);
+function onBackgroundReady() {
+  return BG ? Promise.resolve() : new Promise(ping);
   function ping(resolve) {
     chrome.runtime.sendMessage({method: 'healthCheck'}, health => {
       if (health !== undefined) {
         BG = chrome.extension.getBackgroundPage();
-        resolve(...dataPassthru);
+        resolve();
       } else {
         ping(resolve);
       }
@@ -289,13 +289,14 @@ function onBackgroundReady(...dataPassthru) {
 
 // in case Chrome haven't yet loaded the bg page and displays our page like edit/manage
 function getStylesSafe(options) {
-  return onBackgroundReady(options).then(BG.getStyles);
+  return onBackgroundReady()
+    .then(() => BG.getStyles(options));
 }
 
 
 function saveStyleSafe(style) {
-  return onBackgroundReady(BG.deepCopy(style))
-    .then(BG.saveStyle)
+  return onBackgroundReady()
+    .then(() => BG.saveStyle(BG.deepCopy(style)))
     .then(savedStyle => {
       if (style.notify === false) {
         handleUpdate(savedStyle, style);
@@ -306,8 +307,8 @@ function saveStyleSafe(style) {
 
 
 function deleteStyleSafe({id, notify = true} = {}) {
-  return onBackgroundReady({id, notify})
-    .then(BG.deleteStyle)
+  return onBackgroundReady()
+    .then(() => BG.deleteStyle({id, notify}))
     .then(() => {
       if (!notify) {
         handleDelete(id);

From ddc5cc0ccfcad34efa899b545c43667c2459d3d4 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Fri, 26 May 2017 20:48:26 +0300
Subject: [PATCH 03/94] beautify: option for indenting conditional blocks

---
 _locales/en/messages.json    |  4 +++
 beautify/beautify-css-mod.js | 56 +++++++++++++++++++++---------------
 edit.js                      | 16 +++++++----
 prefs.js                     |  2 +-
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b4ed254c..c3108037 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -498,6 +498,10 @@
     "message": "Beautify",
     "description": "Label for the CSS-beautifier button on the edit style page"
   },
+  "styleBeautifyIndentConditional": {
+    "message": "Indent @media, @supports",
+    "description": "CSS-beautifier option"
+  },
   "styleCancelEditLabel": {
     "message": "Back to manage",
     "description": "Label for cancel button for style editing"
diff --git a/beautify/beautify-css-mod.js b/beautify/beautify-css-mod.js
index e7524144..c2e90f72 100644
--- a/beautify/beautify-css-mod.js
+++ b/beautify/beautify-css-mod.js
@@ -100,27 +100,26 @@
         var newlinesFromLastWSEat = 0;
         var indentSize = options.indent_size ? parseInt(options.indent_size, 10) : 4;
         var indentCharacter = options.indent_char || ' ';
-        var preserve_newlines = (options.preserve_newlines === undefined) ? false : options.preserve_newlines;
-        var selectorSeparatorNewline = (options.selector_separator_newline === undefined) ? true : options.selector_separator_newline;
-        var end_with_newline = (options.end_with_newline === undefined) ? false : options.end_with_newline;
-        var newline_between_rules = (options.newline_between_rules === undefined) ? true : options.newline_between_rules;
-        var space_around_combinator = (options.space_around_combinator === undefined) ? false : options.space_around_combinator;
-        space_around_combinator = space_around_combinator || ((options.space_around_selector_separator === undefined) ? false : options.space_around_selector_separator);
         var eol = options.eol ? options.eol : 'auto';
+        var {
+            preserve_newlines = false,
+            selector_separator_newline = true,
+            end_with_newline = false,
+            newline_between_rules = true,
+            space_around_combinator = true,
+            indent_conditional = true,
+            newline_between_properties = true,
+            newline_before_open_brace = false,
+            newline_after_open_brace = true,
+            newline_before_close_brace = true,
+        } = options;
 
-        /* STYLUS: hack start */
-        const defaultOption = (opt, defaultValue) => opt === undefined ? defaultValue : opt;
-        var newline_between_properties = defaultOption(options.newline_between_properties, true);
-        var newline_before_open_brace = defaultOption(options.newline_before_open_brace, false);
-        var newline_after_open_brace = defaultOption(options.newline_after_open_brace, true);
-        var newline_before_close_brace = defaultOption(options.newline_before_close_brace, true);
         var translatePos = (options.translate_positions || [])[0];
         var translatePosIndex = 0;
         var translatePosLine = translatePos && translatePos.line;
         var translatePosCol = translatePos && translatePos.ch;
         var inputPosLine = 0, inputPosCol = 0;
         var outputPosLine = 0, outputPosCol = 0;
-        /* STYLUS: hack end */
 
         if (options.indent_with_tabs) {
             indentCharacter = '\t';
@@ -304,9 +303,11 @@
             newline_before_open_brace ? print.newLine() : print.singleSpace();
             output.push(ch);
             outputPosCol++;
-            indent();
+            if (!enteringConditionalGroup || indent_conditional) {
+                indent();
+            }
             if (!eatWhitespace(true)) {
-                newline_after_open_brace ? print.newLine() : print.singleSpace();
+                newline_after_open_brace || enteringConditionalGroup ? print.newLine() : print.singleSpace();
             }
         };
         print["}"] = function(newline) {
@@ -315,7 +316,7 @@
             }
             output.push('}');
             outputPosCol++;
-            if (!eatWhitespace(true)) {
+            if (!eatWhitespace(true) && peek(true) != '}') {
                 print.newLine();
             }
         };
@@ -386,6 +387,7 @@
         var insideRule = false;
         var insidePropertyValue = false;
         var enteringConditionalGroup = false;
+        var insideConditionalGroup = false;
         var top_ch = '';
         var last_top_ch = '';
 
@@ -438,13 +440,16 @@
                         print.singleSpace();
                     }
 
-                    variableOrRule = variableOrRule.replace(/\s$/, '');
+                    variableOrRule = '@' + variableOrRule.replace(/\s$/, '');
 
                     // might be a nesting at-rule
                     if (variableOrRule in css_beautify.NESTED_AT_RULE) {
                         nestedLevel += 1;
                         if (variableOrRule in css_beautify.CONDITIONAL_GROUP_RULE) {
                             enteringConditionalGroup = true;
+                            if (!indent_conditional) {
+                                nestedLevel--;
+                            }
                         }
                     }
                 }
@@ -467,6 +472,7 @@
                     // when entering conditional groups, only rulesets are allowed
                     if (enteringConditionalGroup) {
                         enteringConditionalGroup = false;
+                        insideConditionalGroup = true;
                         insideRule = (indentLevel > nestedLevel);
                     } else {
                         // otherwise, declarations are also allowed
@@ -478,10 +484,14 @@
                 print["}"](true);
                 insideRule = false;
                 insidePropertyValue = false;
-                if (nestedLevel) {
+                if (nestedLevel && (indent_conditional || !insideConditionalGroup)) {
                     nestedLevel--;
                 }
-                if (newlinesFromLastWSEat < 2 && newline_between_rules && indentLevel === 0) {
+                insideConditionalGroup = false;
+                if (newlinesFromLastWSEat < 2
+                && newline_between_rules
+                //&& indentLevel === 0
+                && peek(true) != '}') {
                     print.newLine(true);
                 }
             } else if (ch === ":") {
@@ -553,7 +563,7 @@
             } else if (ch === ',') {
                 output.push(ch);
                 outputPosCol++;
-                if (!eatWhitespace(true) && selectorSeparatorNewline && !insidePropertyValue && parenLevel < 1) {
+                if (!eatWhitespace(true) && selector_separator_newline && !insidePropertyValue && parenLevel < 1) {
                     print.newLine();
                 } else {
                     print.singleSpace();
@@ -624,12 +634,12 @@
         // also in CONDITIONAL_GROUP_RULE below
         "@media": true,
         "@supports": true,
-        "@document": true
+        "@-moz-document": true
     };
     css_beautify.CONDITIONAL_GROUP_RULE = {
         "@media": true,
         "@supports": true,
-        "@document": true
+        "@-moz-document": true
     };
 
     /*global define */
@@ -652,4 +662,4 @@
         global.css_beautify = css_beautify;
     }
 
-}());
\ No newline at end of file
+}());
diff --git a/edit.js b/edit.js
index dbbedf18..702c8046 100644
--- a/edit.js
+++ b/edit.js
@@ -1054,6 +1054,9 @@ function beautify(event) {
 			optionHtml("border: none;", "newline_between_properties", true) +
 			optionHtml("display: block;", "newline_before_close_brace", true) +
 			optionHtml("}", "newline_between_rules") +
+			`<label style="display: block; clear: both;"><input data-option="indent_conditional" type="checkbox"
+				${options.indent_conditional !== false ? 'checked' : ''}>` +
+				t('styleBeautifyIndentConditional') + '</label>' +
 			"</div>" +
 			"<div><button role='undo'></button></div>");
 
@@ -1096,13 +1099,14 @@ function beautify(event) {
 			}, 0);
 		});
 
-		document.querySelector(".beautify-options").addEventListener("change", function(event) {
-			var value = event.target.selectedIndex > 0;
-			options[event.target.dataset.option] = value;
-			prefs.set("editor.beautify", options);
-			event.target.parentNode.setAttribute("newline", value.toString());
+		document.querySelector('.beautify-options').onchange = ({target}) => {
+			const value = target.type == 'checkbox' ? target.checked : target.selectedIndex > 0;
+			prefs.set('editor.beautify', Object.assign(options, {[target.dataset.option]: value}));
+			if (target.parentNode.hasAttribute('newline')) {
+				target.parentNode.setAttribute('newline', value.toString());
+			}
 			doBeautify();
-		});
+		};
 
 		function optionHtml(label, optionName, indent) {
 			var value = options[optionName];
diff --git a/prefs.js b/prefs.js
index c632d1e9..00b74663 100644
--- a/prefs.js
+++ b/prefs.js
@@ -37,7 +37,7 @@ var prefs = new function Prefs() {
       newline_before_close_brace: true,
       newline_between_rules: false,
       end_with_newline: false,
-      space_around_selector_separator: true,
+      indent_conditional: true,
     },
     'editor.lintDelay': 500,        // lint gutter marker update delay, ms
     'editor.lintReportDelay': 4500, // lint report update delay, ms

From 8bbab9e0e16c4ca6cfb6dbcee3bfde50d161822f Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 27 May 2017 11:38:13 +0300
Subject: [PATCH 04/94] beautify: don't add extra \n after comments

---
 beautify/beautify-css-mod.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/beautify/beautify-css-mod.js b/beautify/beautify-css-mod.js
index c2e90f72..b5baa1fd 100644
--- a/beautify/beautify-css-mod.js
+++ b/beautify/beautify-css-mod.js
@@ -401,17 +401,12 @@
             if (!ch) {
                 break;
             } else if (ch === '/' && peek() === '*') { /* css comment */
-                var header = indentLevel === 0;
-
-                if (isAfterNewline || header) {
+                if (isAfterNewline) {
                     print.newLine();
                 }
 
                 print.text(eatComment());
                 print.newLine();
-                if (header) {
-                    print.newLine(true);
-                }
             } else if (ch === '/' && peek() === '/') { // single line comment
                 if (!isAfterNewline && last_top_ch !== '{') {
                     print.trim();

From 1098f2666c5aaff17bbe890dbde69af602f67a5a Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Fri, 26 May 2017 22:03:14 +0300
Subject: [PATCH 05/94] beautifier: reworded "Undo in all sections" label

---
 _locales/ar/messages.json    | 4 ----
 _locales/el/messages.json    | 4 ----
 _locales/en/messages.json    | 2 +-
 _locales/fi/messages.json    | 4 ----
 _locales/fr/messages.json    | 4 ----
 _locales/it/messages.json    | 4 ----
 _locales/ja/messages.json    | 4 ----
 _locales/pt_BR/messages.json | 4 ----
 _locales/sv/messages.json    | 4 ----
 _locales/sv_SE/messages.json | 4 ----
 _locales/te/messages.json    | 4 ----
 _locales/tr/messages.json    | 4 ----
 _locales/zh/messages.json    | 4 ----
 13 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index 50c8f547..f6ec193f 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -298,10 +298,6 @@
 		"message": "Turn all styles off",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "اكتمل التحديث.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index ac685072..450b7526 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -302,10 +302,6 @@
 		"message": "Απενεργοποιηση ολων των στυλ",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Η ενημέρωση ολοκληρώθηκε.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index c3108037..973eabf5 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -577,7 +577,7 @@
     "description": "Button label"
   },
   "undoGlobal": {
-    "message": "Undo (global)",
+    "message": "Undo in all sections",
     "description": "CSS-beautify global Undo button label"
   },
   "unreachableContentScript": {
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index 9d7e0ea8..8a4ce03a 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -298,10 +298,6 @@
 		"message": "Turn all styles off",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Päivitys suoritettu.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index b399a0d5..66621f9b 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -302,10 +302,6 @@
 		"message": "Désactiver tous les styles",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Mise à jour terminée.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 3a485c49..3093b539 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -298,10 +298,6 @@
 		"message": "Turn all styles off",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Aggiornamento completato.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index db2a6210..e46b5c52 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -298,10 +298,6 @@
 		"message": "Turn all styles off",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "更新が完了しました",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index 729f3dd4..2caebfdc 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -298,10 +298,6 @@
 		"message": "Turn all styles off",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Atualização concluída.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index 5b015421..4677bf41 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -302,10 +302,6 @@
 		"message": "Stäng av alla stilar",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Uppdatering slutförd.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/sv_SE/messages.json b/_locales/sv_SE/messages.json
index 1016654e..f726569e 100644
--- a/_locales/sv_SE/messages.json
+++ b/_locales/sv_SE/messages.json
@@ -302,10 +302,6 @@
 		"message": "Stäng av alla stilar",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Uppdatering slutförd.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/te/messages.json b/_locales/te/messages.json
index ed0550f2..7b532ef5 100644
--- a/_locales/te/messages.json
+++ b/_locales/te/messages.json
@@ -298,10 +298,6 @@
 		"message": "Turn all styles off",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Update completed.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index efbc2fd3..a0f19961 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -298,10 +298,6 @@
 		"message": "Turn all styles off",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "Güncelleme tamamlandı.",
 		"description": "Text that displays when an update completed"
diff --git a/_locales/zh/messages.json b/_locales/zh/messages.json
index a28bf22c..49712720 100644
--- a/_locales/zh/messages.json
+++ b/_locales/zh/messages.json
@@ -298,10 +298,6 @@
 		"message": "Turn all styles off",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"undoGlobal": {
-		"message": "Undo (global)",
-		"description": "CSS-beautify global Undo button label"
-	},
 	"updateCompleted": {
 		"message": "更新完成.",
 		"description": "Text that displays when an update completed"

From 14e8dedded92c3c7222bfda9d6d8f2c16ebd78ef Mon Sep 17 00:00:00 2001
From: Jeremy Schomery <jeremy.schomery@yahoo.com>
Date: Tue, 30 May 2017 16:21:41 +0430
Subject: [PATCH 06/94] version 1.0.9

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 9612f5c4..de82f459 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Stylus",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "minimum_chrome_version": "49",
   "description": "__MSG_description__",
   "homepage_url": "http://add0n.com/stylus.html",

From cec649e0eef78350d2cfb9fe0dab753b06b0ba11 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 3 Jun 2017 16:52:58 +0300
Subject: [PATCH 07/94] openURL should not open own pages in incognito tabs

We're using the default "spanning mode" which doesn't support it
---
 messaging.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/messaging.js b/messaging.js
index c11e1f4c..5e4766c3 100644
--- a/messaging.js
+++ b/messaging.js
@@ -142,7 +142,8 @@ function openURL({url, currentWindow = true}) {
         }
       }
       getActiveTab().then(tab => {
-        if (tab && tab.url == 'chrome://newtab/') {
+        if (tab && tab.url == 'chrome://newtab/'
+        && (!url.startsWith(URLS.ownOrigin) || !tab.incognito)) {
           chrome.tabs.update({url}, resolve);
         } else {
           chrome.tabs.create(tab && !FIREFOX ? {url, openerTabId: tab.id} : {url}, resolve);

From be9cfe072d1e3b1743d118eddc8eb52a9f3d6a47 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 3 Jun 2017 16:57:52 +0300
Subject: [PATCH 08/94] openURL should not redirect incognito NTP to chrome
 URLs

---
 messaging.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/messaging.js b/messaging.js
index 5e4766c3..72a0fa0a 100644
--- a/messaging.js
+++ b/messaging.js
@@ -143,7 +143,8 @@ function openURL({url, currentWindow = true}) {
       }
       getActiveTab().then(tab => {
         if (tab && tab.url == 'chrome://newtab/'
-        && (!url.startsWith(URLS.ownOrigin) || !tab.incognito)) {
+        // prevent redirecting incognito NTP to a chrome URL as it crashes Chrome
+        && (!url.startsWith('chrome') || !tab.incognito)) {
           chrome.tabs.update({url}, resolve);
         } else {
           chrome.tabs.create(tab && !FIREFOX ? {url, openerTabId: tab.id} : {url}, resolve);

From 2b1d8742367fe0f25c516c08e6d5deaf8ca0be5a Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 4 Jun 2017 10:39:27 +0300
Subject: [PATCH 09/94] Update style settings on USO without page reload

---
 install.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/install.js b/install.js
index 560546e7..d84aca21 100644
--- a/install.js
+++ b/install.js
@@ -122,18 +122,32 @@ function saveStyleCode(message, name, addProps) {
     if (!confirm(chrome.i18n.getMessage(message, [name]))) {
       return;
     }
-
+    enableUpdateButton(false);
     getResource(getStyleURL()).then(code => {
       chrome.runtime.sendMessage(
         Object.assign(JSON.parse(code), addProps, {
           method: 'saveStyle',
           reason: 'update',
         }),
-        () => sendEvent('styleInstalledChrome')
+        style => {
+          if (style.updateUrl.includes('?')) {
+            enableUpdateButton(true);
+          } else {
+            sendEvent('styleInstalledChrome');
+          }
+        }
       );
       resolve();
     });
   });
+
+  function enableUpdateButton(state) {
+    const button = document.getElementById('update_style_button');
+    if (button) {
+      button.style.cssText = state ? '' :
+        'pointer-events: none !important; opacity: .25 !important;';
+    }
+  }
 }
 
 

From 5a67d926da06f8658102130676884d368ec4d32a Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 4 Jun 2017 12:22:51 +0300
Subject: [PATCH 10/94] manage: fix toggling a style when filtering by search

Previously a style entry would disappear when toggled on manage page with search filter applied because filterContainer() altered the original "container" parameter.
---
 manage.js | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/manage.js b/manage.js
index d1f3149e..c5485367 100644
--- a/manage.js
+++ b/manage.js
@@ -764,8 +764,7 @@ function filterAndAppend({entry, container}) {
     if (!filtersSelector.hide || !entry.matches(filtersSelector.hide)) {
       entry.classList.add('hidden');
     }
-  }
-  if ($('#search').value.trim()) {
+  } else if ($('#search').value.trim()) {
     searchStyles({immediately: true, container});
   }
   reapplyFilter(container);
@@ -774,14 +773,20 @@ function filterAndAppend({entry, container}) {
 
 function reapplyFilter(container = installed) {
   // A: show
-  let toUnhide = filtersSelector.hide ? filterContainer({hide: false}) : container;
+  let toHide = [];
+  let toUnhide = [];
+  if (filtersSelector.hide) {
+    filterContainer({hide: false});
+  } else {
+    toUnhide = container;
+  }
   // showStyles() is building the page and no filters are active
   if (toUnhide instanceof DocumentFragment) {
     installed.appendChild(toUnhide);
     return;
   } else if (toUnhide.length && $('#search').value.trim()) {
     searchStyles({immediately: true, container: toUnhide});
-    toUnhide = filterContainer({hide: false});
+    filterContainer({hide: false});
   }
   // filtering needed or a single-element job from handleUpdate()
   const entries = installed.children;
@@ -798,7 +803,9 @@ function reapplyFilter(container = installed) {
     }
   }
   // B: hide
-  const toHide = filtersSelector.hide ? filterContainer({hide: true}) : [];
+  if (filtersSelector.hide) {
+    filterContainer({hide: true});
+  }
   if (!toHide.length) {
     return;
   }
@@ -831,16 +838,16 @@ function reapplyFilter(container = installed) {
     if (container.filter) {
       if (hide) {
         // already filtered in previous invocation
-        return container;
+        return;
       }
-      const toHide = [], toUnhide = [];
       for (const el of container) {
         (el.matches(selector) ? toUnhide : toHide).push(el);
       }
-      container = toHide;
-      return toUnhide;
+      return;
+    } else if (hide) {
+      toHide = $$(selector, container);
     } else {
-      return $$(selector, container);
+      toUnhide = $$(selector, container);
     }
   }
 

From cd84a33a538281b327c9f9fe6c1e7de73f536ffa Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 4 Jun 2017 18:26:53 +0300
Subject: [PATCH 11/94] fixup: "Install style" should not persist on click

---
 install.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.js b/install.js
index d84aca21..a4311be4 100644
--- a/install.js
+++ b/install.js
@@ -130,7 +130,7 @@ function saveStyleCode(message, name, addProps) {
           reason: 'update',
         }),
         style => {
-          if (style.updateUrl.includes('?')) {
+          if (message == 'styleUpdate' && style.updateUrl.includes('?')) {
             enableUpdateButton(true);
           } else {
             sendEvent('styleInstalledChrome');

From 7a4f499e0d4d36c1acc13c757b64e4c0b2737788 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 4 Jun 2017 15:55:31 +0300
Subject: [PATCH 12/94] patch buggy USO site to use actual style settings

---
 install.js | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/install.js b/install.js
index a4311be4..12a433c1 100644
--- a/install.js
+++ b/install.js
@@ -19,6 +19,78 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
   }
 });
 
+// TODO: remove the following statement when USO is fixed
+document.documentElement.appendChild(document.createElement('script')).text = '(' +
+  function() {
+    let settings;
+    document.addEventListener('stylusFixBuggyUSOsettings', function _({detail}) {
+      document.removeEventListener('stylusFixBuggyUSOsettings', _);
+      settings = /\?/.test(detail) && new URLSearchParams(new URL(detail).search);
+    });
+    const originalResponseJson = Response.prototype.json;
+    Response.prototype.json = function(...args) {
+      return originalResponseJson.call(this, ...args).then(json => {
+        Response.prototype.json = originalResponseJson;
+        if (!settings || typeof ((json || {}).style_settings || {}).every != 'function') {
+          return json;
+        }
+        const images = new Map();
+        for (const jsonSetting of json.style_settings) {
+          let value = settings.get('ik-' + jsonSetting.install_key);
+          if (!value
+          || !jsonSetting.style_setting_options
+          || !jsonSetting.style_setting_options[0]) {
+            continue;
+          }
+          if (value.startsWith('ik-')) {
+            value = value.replace(/^ik-/, '');
+            const defaultItem = jsonSetting.style_setting_options.find(item => item.default);
+            if (!defaultItem || defaultItem.install_key != value) {
+              if (defaultItem) {
+                defaultItem.default = false;
+              }
+              jsonSetting.style_setting_options.some(item => {
+                if (item.install_key == value) {
+                  item.default = true;
+                  return true;
+                }
+              });
+            }
+          } else if (jsonSetting.setting_type == 'image') {
+            jsonSetting.style_setting_options.some(item => {
+              if (item.default) {
+                item.default = false;
+                return true;
+              }
+            });
+            images.set(jsonSetting.install_key, value);
+          } else {
+            const item = jsonSetting.style_setting_options[0];
+            if (item.value !== value && item.install_key == 'placeholder') {
+              item.value = value;
+            }
+          }
+        }
+        if (images.size) {
+          new MutationObserver((_, observer) => {
+            if (!document.getElementById('style-settings')) {
+              return;
+            }
+            observer.disconnect();
+            for (const [name, url] of images.entries()) {
+              const elRadio = document.querySelector(`input[name="ik-${name}"][value="user-url"]`);
+              const elUrl = elRadio && document.getElementById(elRadio.id.replace('url-choice', 'user-url'));
+              if (elUrl) {
+                elUrl.value = url;
+              }
+            }
+          }).observe(document, {childList: true, subtree: true});
+        }
+        return json;
+      });
+    };
+  } + ')()';
+
 new MutationObserver((mutations, observer) => {
   if (document.body) {
     observer.disconnect();
@@ -46,6 +118,10 @@ function getStyleURL () {
 }
 
 function checkUpdatability([installedStyle]) {
+  // TODO: remove the following statement when USO is fixed
+  document.dispatchEvent(new CustomEvent('stylusFixBuggyUSOsettings', {
+    detail: installedStyle && installedStyle.updateUrl,
+  }));
   if (!installedStyle) {
     sendEvent('styleCanBeInstalledChrome');
     return;

From 19754a5a900c9564c47d574ba9957f629e76ed5b Mon Sep 17 00:00:00 2001
From: Jeremy Schomery <jeremy.schomery@yahoo.com>
Date: Mon, 5 Jun 2017 15:45:07 +0430
Subject: [PATCH 13/94] updating es locale

---
 _locales/es/messages.json | 92 +++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 42 deletions(-)

diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 0bf45dd6..364fec03 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -40,11 +40,11 @@
 		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Habilitar",
+		"message": "Activar",
 		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Introduzca un nombre.",
+		"message": "Introduzca un nombre",
 		"description": "Error displayed when user saves without providing a name"
 	},
 	"genericHistoryLabel": {
@@ -52,7 +52,7 @@
 		"description": "Used in various places to show a history log of something"
 	},
 	"shortcutsNote": {
-		"message": "Define atajos de teclado",
+		"message": "Defina atajos de teclado",
 		"description": ""
 	},
 	"appliesDomainOption": {
@@ -68,7 +68,7 @@
 		"description": "Tooltip in the popup for styles that were not applied at all"
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "Algunas reglas 'regexp()' que no se pudieron compilar en absoluto.",
+		"message": "Algunas reglas «regexp()» que no se pudieron compilar en absoluto.",
 		"description": ""
 	},
 	"importAppendLabel": {
@@ -92,7 +92,7 @@
 		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
 	},
 	"dragDropMessage": {
-		"message": "Suelte su fichero de copia de seguridad en cualquier lugar de esta página para importar.",
+		"message": "Suelte su fichero de copia de seguridad en cualquier lugar de esta página para importarlo.",
 		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
@@ -116,7 +116,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Buscar más estilos para este sitio",
+		"message": "Encontrar más estilos para este sitio.",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
@@ -132,7 +132,7 @@
 		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Habilitado",
+		"message": "Activado",
 		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
@@ -168,7 +168,7 @@
 		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "Esta URL",
+		"message": "este URL",
 		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
 	"optionsSubheading": {
@@ -184,7 +184,7 @@
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "Habilita la escritura de CSS específico-para-iframe como 'html[stylus-iframe] h1 { display:none }'",
+		"message": "Activa la escritura de CSS específico-para-iframe como «html[stylus-iframe] h1 { display:none }»",
 		"description": ""
 	},
 	"importReportLegendUpdatedCode": {
@@ -192,7 +192,7 @@
 		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
-		"message": "¿Instalar \"$stylename$\" en Stylus?",
+		"message": "¿Quiere instalar «$stylename$» en Stylus?",
 		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
@@ -201,7 +201,7 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "Color de fondo cuando está deshabilitado",
+		"message": "Color de fondo cuando está desactivado",
 		"description": ""
 	},
 	"optionsCheck": {
@@ -229,15 +229,15 @@
 		"description": "Label for the button to apply all detected updates"
 	},
 	"unreachableFileHint": {
-		"message": "Stylus puede acceder a URLs file:// sólo si habilita la casilla correspondiente para la extensión Stylus en la página chrome://extensions.",
+		"message": "Stylus puede acceder a URL file:// solo si activa la casilla correspondiente para la extensión Stylus en la página chrome://extensions.",
 		"description": "Note in the toolbar popup for file:// URLs"
 	},
 	"disableStyleLabel": {
-		"message": "Deshabilitar",
+		"message": "Desactivar",
 		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Número de estilos activos para el sitio actual",
+		"message": "Número de estilos activos en el sitio actual",
 		"description": "Label for the checkbox controlling toolbar badge text."
 	},
 	"manageFavicons": {
@@ -269,7 +269,7 @@
 		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Error de actualización - No se pudo alcanzar el servidor.",
+		"message": "Error de actualización: no se pudo contactar con el servidor.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
@@ -281,7 +281,7 @@
 		"description": "Label for the button to apply all detected updates"
 	},
 	"optionsReset": {
-		"message": "Reinicializar las opciones a sus valores predeterminados.",
+		"message": "Restablecer las opciones a sus valores predeterminados.",
 		"description": ""
 	},
 	"optionsCustomizeUpdate": {
@@ -289,7 +289,7 @@
 		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "¿Está seguro de que quiere eliminar este estilo?",
+		"message": "¿Confirma que quiere eliminar este estilo?",
 		"description": "Confirmation before deleting a style"
 	},
 	"optionsCustomizePopup": {
@@ -297,7 +297,7 @@
 		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "La expresión regular (regexp) introducida no es válida",
+		"message": "La expresión regular proporcionada no es válida.",
 		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
@@ -318,7 +318,7 @@
 		"description": "Label for the style maanger opener in the browser action context menu."
 	},
 	"styleUpdate": {
-		"message": "¿Está seguro de que quiere actualizar '$stylename$'?",
+		"message": "¿Confirma que quiere actualizar «$stylename$»?",
 		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
@@ -348,7 +348,7 @@
 		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URLs que empiezan por",
+		"message": "URLs que empiezan con",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
 	"cm_matchHighlightToken": {
@@ -356,7 +356,7 @@
 		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
 	},
 	"searchRegexp": {
-		"message": "Use la sintaxis /re/ para búsquedas con regexp",
+		"message": "Use la sintaxis /re/ para búsquedas con expresiones regulares",
 		"description": "Label after the search input field in the editor shown on Ctrl-F"
 	},
 	"updateCheckManualUpdateHint": {
@@ -372,7 +372,7 @@
 		"description": "Label for the button to import and overwrite current style"
 	},
 	"popupStylesFirst": {
-		"message": "Estilos antes de los comandos",
+		"message": "Estilos antes que las órdenes",
 		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
@@ -432,7 +432,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Error de actualización - El servidor ha respondido con el código $code$.",
+		"message": "Error de actualización: el servidor ha respondido con el código $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
@@ -468,6 +468,10 @@
 		"message": "Este estilo utiliza expresiones regulares (regexps) parcialmente coincidentes violando así la <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>especificación @document de CSS4</a> que requiere una coincidencia completa de URL. Las secciones CSS afectadas no se aplicaron a la página. Probablemente este estilo fue creado con Stylish-para-Chrome, que evalúa de modo incorrecto las reglas 'regexp()' desde la primera versión (un fallo conocido).",
 		"description": ""
 	},
+	"styleBeautifyIndentConditional": {
+		"message": "Sangrar @media, @supports",
+		"description": "CSS-beautifier option"
+	},
 	"unreachableContentScript": {
 		"message": "No se pudo comunicar con la página. Pruebe a recargar la pestaña.",
 		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
@@ -477,15 +481,15 @@
 		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Deshabilitar todos los estlos",
+		"message": "Desactivar todos los estilos",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "Este estilo podría haber sido editado localmente.",
+		"message": "Este estilo podría haberse editado localmente.",
 		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
 	},
 	"undoGlobal": {
-		"message": "Deshacer (global)",
+		"message": "Deshacer en todas las secciones",
 		"description": "CSS-beautify global Undo button label"
 	},
 	"updateCompleted": {
@@ -513,7 +517,7 @@
 		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsResetButton": {
-		"message": "Opciones de reinicialización",
+		"message": "Restablecer opciones",
 		"description": ""
 	},
 	"sectionCode": {
@@ -521,7 +525,7 @@
 		"description": "Label for the code for a section"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "Añadir 'Borrar' al menú contextual del editor",
+		"message": "Añadir 'Eliminar' al menú contextual del editor",
 		"description": ""
 	},
 	"importReportLegendUpdatedBoth": {
@@ -533,11 +537,11 @@
 		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
 	"styleRegexpTestButton": {
-		"message": "Test de regexp",
+		"message": "Prueba de regexp",
 		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Utilice los controles 'Se aplica a' para limitar las URLs a las que se aplica el código de esta sección.",
+		"message": "Utilice los controles 'Se aplica a' para limitar a qué URLs se aplica el código de esta sección.",
 		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
@@ -545,9 +549,13 @@
 		"description": "Title of the page for editing styles"
 	},
 	"editDeleteText": {
-		"message": "Borrar",
+		"message": "Eliminar",
 		"description": "Label for the context menu item in the editor to delete selected text"
 	},
+	"stylusUnavailableForURLdetails": {
+		"message": "Como medida de precaución, el navegador prohíbe que las extensiones afecten a sus páginas internas (como chrome://version o about:addons) además de las páginas internas de otras extensiones. Cada navegador además restringe el acceso a su propia galería de extensiones (como Chrome Web Store o AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
 	"cm_matchHighlightSelection": {
 		"message": "Sólo selección",
 		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
@@ -601,7 +609,7 @@
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "Regexp no válidas omitidas",
+		"message": "Expresiones regulares no válidas omitidas",
 		"description": "RegExp test report: label for the invalid expressions"
 	},
 	"replaceAll": {
@@ -661,7 +669,7 @@
 		"description": "Label for the drop-down list controlling the keymap for the style editor."
 	},
 	"manageNewUI": {
-		"message": "Nuevo diseño de interfaz de administración",
+		"message": "Nuevo diseño de interfaz de gestión",
 		"description": "Label for the checkbox that toggles the new UI on manage page"
 	},
 	"importReportUndoneTitle": {
@@ -669,7 +677,7 @@
 		"description": "Title of the message box shown after undoing the import of styles"
 	},
 	"genericDisabledLabel": {
-		"message": "Deshabilitado",
+		"message": "Desactivado",
 		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
@@ -693,11 +701,11 @@
 		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Escribir nuevo estilo",
+		"message": "Escribir un nuevo estilo",
 		"description": "Label for the button to go to the add style page"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "Para deshabilitar las búsquedas automáticas de actualizaciones, establezca el intervalo a 0",
+		"message": "Para desactivar las búsquedas automáticas de actualizaciones, establezca el intervalo a 0",
 		"description": ""
 	},
 	"backupButtons": {
@@ -705,7 +713,7 @@
 		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "Sólo estilos habilitados",
+		"message": "Sólo estilos activos",
 		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
@@ -713,11 +721,11 @@
 		"description": "Label for the button to go to the edit style page"
 	},
 	"cm_theme": {
-		"message": "Tema",
+		"message": "Temas",
 		"description": "Label for the style editor's CSS theme."
 	},
 	"backupMessage": {
-		"message": "Seleccione un fichero o arrastre y suéltelo en esta página.",
+		"message": "Seleccione un fichero o arrástrelo y suéltelo en esta página.",
 		"description": "Message for backup"
 	},
 	"importReportUndone": {
@@ -725,11 +733,11 @@
 		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "Escriba un nombre de comando",
+		"message": "Nombre del comando",
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Modifique el estilo de la Web con Stylus, un administrador de estilos de usuario. Stylus le permite instalar fácilmente temas y coberturas para muchos sitios populares.",
+		"message": "Rediseñe la web con Stylus, un administrador de estilos de usuario. Stylus le permite instalar fácilmente temas y coberturas para muchos sitios populares.",
 		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file

From ac5e9b965a11937a9a12c7cb8a8a900d143a6a71 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 6 Jun 2017 04:40:08 +0300
Subject: [PATCH 14/94] saveStyle's codeIsUpdated can be true or false, not
 undefined

---
 storage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage.js b/storage.js
index 3ffb020f..c56fc4f8 100644
--- a/storage.js
+++ b/storage.js
@@ -260,7 +260,7 @@ function saveStyle(style) {
         if (reason == 'update-digest' && oldStyle.originalDigest == style.originalDigest) {
           return style;
         }
-        codeIsUpdated = !existed || style.sections && !styleSectionsEqual(style, oldStyle);
+        codeIsUpdated = !existed || 'sections' in style && !styleSectionsEqual(style, oldStyle);
         style = Object.assign({}, oldStyle, style);
         return write(style, store);
       });

From 6df239213252872f7909d7bcdf0e756fd741f777 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 6 Jun 2017 10:33:45 +0300
Subject: [PATCH 15/94] FF bug workaround for tabs.query with moz-extension://

---
 messaging.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/messaging.js b/messaging.js
index 72a0fa0a..5cf66013 100644
--- a/messaging.js
+++ b/messaging.js
@@ -133,8 +133,10 @@ function openURL({url, currentWindow = true}) {
   return new Promise(resolve => {
     // [some] chromium forks don't handle their fake branded protocols
     url = url.replace(/^(opera|vivaldi)/, 'chrome');
+    // FF doesn't handle moz-extension:// URLs (bug)
     // API doesn't handle the hash-fragment part
-    chrome.tabs.query({url: url.replace(/#.*/, ''), currentWindow}, tabs => {
+    const urlQuery = url.startsWith('moz-extension') ? undefined : url.replace(/#.*/, '');
+    chrome.tabs.query({url: urlQuery, currentWindow}, tabs => {
       for (const tab of tabs) {
         if (tab.url == url) {
           activateTab(tab).then(resolve);

From 4559162d457cef014325c34ab27ef3e62c4c5a16 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 6 Jun 2017 10:56:49 +0300
Subject: [PATCH 16/94] Alt-Enter in the editor to toggle&save the style

---
 _locales/en/messages.json |  4 ++++
 edit.html                 |  5 ++++-
 edit.js                   | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 973eabf5..a5b7c4fe 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -514,6 +514,10 @@
     "message": "Enabled",
     "description": "Label for the enabled state of styles"
   },
+  "styleEnabledToggleHint": {
+    "message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+    "description": "Help text for the '[x] enable' checkbox in the editor"
+  },
   "styleInstall": {
     "message": "Install '$stylename$' into Stylus?",
     "description": "Confirmation when installing a style",
diff --git a/edit.html b/edit.html
index 5d8df5a9..a263cc66 100644
--- a/edit.html
+++ b/edit.html
@@ -672,7 +672,10 @@
 				</div>
 				<div id="basic-info-enabled">
 					<input type="checkbox" id="enabled" class="style-contributor">
-					<label for="enabled" id="enabled-label" i18n-text="styleEnabledLabel"></label>
+					<label for="enabled" id="enabled-label" i18n-text="styleEnabledLabel"></label><!--
+					--><svg id="toggle-style-help" class="svg-icon info">
+						<use xlink:href="#svg-icon-help"/>
+					</svg>
 				</div>
 			</section>
 			<section id="actions">
diff --git a/edit.js b/edit.js
index 702c8046..354f2c08 100644
--- a/edit.js
+++ b/edit.js
@@ -53,7 +53,8 @@ getCodeMirrorThemes();
 var hotkeyRerouter = {
 	commands: {
 		save: true, jumpToLine: true, nextEditor: true, prevEditor: true,
-		find: true, findNext: true, findPrev: true, replace: true, replaceAll: true
+		find: true, findNext: true, findPrev: true, replace: true, replaceAll: true,
+		toggleStyle: true,
 	},
 	setState: function(enable) {
 		setTimeout(function() {
@@ -166,6 +167,7 @@ function initCodeMirror() {
 		theme: "default",
 		keyMap: prefs.get("editor.keyMap"),
 		extraKeys: { // independent of current keyMap
+			"Alt-Enter": "toggleStyle",
 			"Alt-PageDown": "nextEditor",
 			"Alt-PageUp": "prevEditor"
 		}
@@ -179,6 +181,7 @@ function initCodeMirror() {
 	CM.commands.blockComment = function(cm) {
 		cm.blockComment(cm.getCursor("from"), cm.getCursor("to"), {fullLines: false});
 	};
+	CM.commands.toggleStyle = toggleStyle;
 
 	// "basic" keymap only has basic keys by design, so we skip it
 
@@ -849,6 +852,11 @@ function jumpToLine(cm) {
 	}, {value: cur.line+1});
 }
 
+function toggleStyle() {
+	$('#enabled').checked = !$('#enabled').checked;
+	save();
+}
+
 function refocusMinidialog(cm) {
 	var section = cm.getSection();
 	if (!section.querySelector(".CodeMirror-dialog")) {
@@ -1211,6 +1219,7 @@ function initHooks() {
 		node.addEventListener("change", onChange);
 		node.addEventListener("input", onChange);
 	});
+	document.getElementById("toggle-style-help").addEventListener("click", showToggleStyleHelp);
 	document.getElementById("to-mozilla").addEventListener("click", showMozillaFormat, false);
 	document.getElementById("to-mozilla-help").addEventListener("click", showToMozillaHelp, false);
 	document.getElementById("from-mozilla").addEventListener("click", fromMozillaFormat);
@@ -1581,6 +1590,10 @@ function showToMozillaHelp() {
 	showHelp(t("styleMozillaFormatHeading"), t("styleToMozillaFormatHelp"));
 }
 
+function showToggleStyleHelp() {
+	showHelp(t("helpAlt"), t("styleEnabledToggleHint"));
+}
+
 function showKeyMapHelp() {
 	var keyMap = mergeKeyMaps({}, prefs.get("editor.keyMap"), CodeMirror.defaults.extraKeys);
 	var keyMapSorted = Object.keys(keyMap)

From d36489216c0bb326b88e315fd61daa2c17c6c100 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 6 Jun 2017 16:44:16 +0300
Subject: [PATCH 17/94] Don't save maximized editor window size&pos

This fixes the bug with reloading the editor tab in a maximized state: previously the window was losing its state.

Assuming a detached editor window normally is expected to have a smaller size and custom position, the user may occasionally maximize it for convenience, in which case we don't save its size and position.

Even if this assumption is wrong, it's easy to manually resize the window to fill the entire screen so that the size/position are remembered.
---
 edit.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/edit.js b/edit.js
index 354f2c08..9bf5c618 100644
--- a/edit.js
+++ b/edit.js
@@ -423,7 +423,9 @@ document.addEventListener("wheel", function(event) {
 chrome.tabs.query({currentWindow: true}, function(tabs) {
 	var windowId = tabs[0].windowId;
 	if (prefs.get("openEditInWindow")) {
-		if (sessionStorage.saveSizeOnClose && 'left' in prefs.get('windowPosition', {})) {
+		if (sessionStorage.saveSizeOnClose
+		&& 'left' in prefs.get('windowPosition', {})
+		&& !isWindowMaximized()) {
 			// window was reopened via Ctrl-Shift-T etc.
 			chrome.windows.update(windowId, prefs.get('windowPosition'));
 		}
@@ -458,8 +460,15 @@ function goBackToManage(event) {
 	}
 }
 
+function isWindowMaximized() {
+	return window.screenLeft == 0
+		&& window.screenTop == 0
+		&& window.outerWidth == screen.availWidth
+		&& window.outerHeight == screen.availHeight;
+}
+
 window.onbeforeunload = function() {
-	if (saveSizeOnClose) {
+	if (saveSizeOnClose	&& !isWindowMaximized()) {
 		prefs.set("windowPosition", {
 			left: screenLeft,
 			top: screenTop,

From 972968b109c6f92917aadbc99b58101c9662c745 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Fri, 9 Jun 2017 01:46:25 +0300
Subject: [PATCH 18/94] FF popup has 2 buttons so each should be 50%

---
 popup.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/popup.css b/popup.css
index 9124fa3e..dec24989 100644
--- a/popup.css
+++ b/popup.css
@@ -348,6 +348,10 @@ body.blocked .actions > .left-gutter {
   text-overflow: ellipsis;
 }
 
+.firefox #popup-options button {
+  width: 50%;
+}
+
 /* confirm */
 
 #confirm,

From 0817a03b61aa675e2ca809cf7481450ecbb7bb9a Mon Sep 17 00:00:00 2001
From: Jeremy Schomery <jeremy.schomery@yahoo.com>
Date: Sat, 10 Jun 2017 11:29:17 +0430
Subject: [PATCH 19/94] renaming the repository name from stylish-chrome to
 stylus

---
 README.md              | 4 ++--
 backup/fileSaveLoad.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d811f077..f5e0f4ff 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@ See the [help docs](http://userstyles.org/help/stylish_chrome) or [ask in userst
 
 ## Contributing
 
-The source is hosted on [GitHub](https://github.com/schomery/stylish-chrome) and pull requests are welcome.
+The source is hosted on [GitHub](https://github.com/schomery/stylus) and pull requests are welcome.
 
-You can help us translate the extension on [Transifex](https://www.transifex.com/github-7/Stylus). When `messages.json` file is ready to be merged, please open a new bug report in [stylish-chrome/issues](https://github.com/schomery/stylish-chrome/issues).
+You can help us translate the extension on [Transifex](https://www.transifex.com/github-7/Stylus). When `messages.json` file is ready to be merged, please open a new bug report in [stylus/issues](https://github.com/schomery/stylus/issues).
 
 ## License
 
diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index 9ebd7f62..ab57ca70 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -297,7 +297,7 @@ $('#file-all-styles').onclick = () => {
     const text = JSON.stringify(styles, null, '\t');
     const url = 'data:text/plain;charset=utf-8,' + encodeURIComponent(text);
     return url;
-    // for long URLs; https://github.com/schomery/stylish-chrome/issues/13#issuecomment-284582600
+    // for long URLs; https://github.com/schomery/stylus/issues/13#issuecomment-284582600
   }).then(fetch)
     .then(res => res.blob())
     .then(blob => {

From 2e86c95842dd39c61a6beff028f14ed717124854 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 10 Jun 2017 12:41:44 +0300
Subject: [PATCH 20/94] csslint: fire startdocument on {

---
 csslint/csslint-worker.js | 3 ++-
 edit.js                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/csslint/csslint-worker.js b/csslint/csslint-worker.js
index 75b5df44..46a72d4b 100644
--- a/csslint/csslint-worker.js
+++ b/csslint/csslint-worker.js
@@ -1675,7 +1675,6 @@ Parser.prototype = function() {
                 }
 
                 tokenStream.mustMatch(Tokens.LBRACE);
-                this._readWhitespace();
 
                 this.fire({
                     type:      "startdocument",
@@ -1685,6 +1684,8 @@ Parser.prototype = function() {
                     col:       token.startCol
                 });
 
+                this._readWhitespace(); // Stylus hack
+
                 var ok = true;
                 while (ok) {
                     switch (tokenStream.peek()) {
diff --git a/edit.js b/edit.js
index 9bf5c618..2f9ede93 100644
--- a/edit.js
+++ b/edit.js
@@ -1576,7 +1576,7 @@ function fromMozillaFormat() {
 	}
 	function backtrackTo(parser, tokenType, startEnd) {
 		var tokens = parser._tokenStream._lt;
-		for (var i = tokens.length - 2; i >= 0; --i) {
+		for (var i = parser._tokenStream._ltIndex - 1; i >= 0; --i) {
 			if (tokens[i].type == tokenType) {
 				return {line: tokens[i][startEnd+"Line"], col: tokens[i][startEnd+"Col"]};
 			}

From 2687d1e1671eadb858259cdc81b04d7b50ec3e9a Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 10 Jun 2017 14:08:03 +0300
Subject: [PATCH 21/94] FF bug workaround: retranslate CSS content

---
 dom.js    | 12 ++++++++++++
 manage.js | 11 ++++++++++-
 popup.js  | 15 +++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/dom.js b/dom.js
index 30d21779..b1443562 100644
--- a/dom.js
+++ b/dom.js
@@ -123,3 +123,15 @@ function $element(opt) {
   }
   return element;
 }
+
+
+function retranslateCSS(selectorToMessageMap) {
+  // TODO: remove when this bug is fixed in FF
+  // Note: selectors must be spec-normalized e.g. ::before, not :before
+  for (const rule of document.styleSheets[0].cssRules) {
+    const msg = selectorToMessageMap[rule.selectorText];
+    if (msg) {
+      rule.style.content = '"' + msg.replace(/__MSG_(\w+)__/g, (_, id) => t(id)) + '"';
+    }
+  }
+}
diff --git a/manage.js b/manage.js
index c5485367..61829014 100644
--- a/manage.js
+++ b/manage.js
@@ -1,4 +1,4 @@
-/* global messageBox, getStyleWithNoCode */
+/* global messageBox, getStyleWithNoCode, retranslateCSS */
 'use strict';
 
 let installed;
@@ -31,6 +31,15 @@ Promise.all([
   showStyles(styles);
 });
 
+if (FIREFOX) {
+  // TODO: remove when this bug is fixed in FF
+  retranslateCSS({
+    '.disabled h2::after':
+      '__MSG_genericDisabledLabel__',
+    '#update-all-no-updates[data-skipped-edited="true"]::after':
+      ' __MSG_updateAllCheckSucceededSomeEdited__',
+  });
+}
 
 chrome.runtime.onMessage.addListener(onRuntimeMessage);
 
diff --git a/popup.js b/popup.js
index fde184bf..1e951533 100644
--- a/popup.js
+++ b/popup.js
@@ -1,3 +1,4 @@
+/* global retranslateCSS */
 'use strict';
 
 let installed;
@@ -16,6 +17,20 @@ getActiveTabRealURL().then(url => {
   });
 });
 
+if (FIREFOX) {
+  // TODO: remove when this bug is fixed in FF
+  retranslateCSS({
+    '.blocked::before':
+      '__MSG_stylusUnavailableForURL__',
+    '.blocked #installed::before':
+      '__MSG_stylusUnavailableForURLdetails__',
+    '.unreachable::before':
+      '__MSG_unreachableContentScript__',
+    '.unreachable #installed::before':
+      '__MSG_unreachableFileHint__',
+  });
+}
+
 chrome.runtime.onMessage.addListener(onRuntimeMessage);
 
 function onRuntimeMessage(msg) {

From 22a20865350aa75955eeb74772d2a0e04a3ff2d9 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 10 Jun 2017 21:33:37 +0300
Subject: [PATCH 22/94] FF: suppress pingCS() errors in browser console

---
 background.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/background.js b/background.js
index 0d80d7ce..eed9a9aa 100644
--- a/background.js
+++ b/background.js
@@ -190,7 +190,12 @@ contextMenus = Object.assign({
     cs.matches.some(match => {
       if ((match == ALL_URLS || url.match(match))
         && (!url.startsWith('chrome') || url == NTP)) {
-        chrome.tabs.sendMessage(id, PING, pong => !pong && injectCS(cs, id));
+        chrome.tabs.sendMessage(id, PING, pong => {
+          if (!pong) {
+            injectCS(cs, id);
+          }
+          ignoreChromeError();
+        });
         return true;
       }
     });

From 218c6adfa025b2b3f328c759872d1d1de4ee24bc Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 11 Jun 2017 15:01:48 +0300
Subject: [PATCH 23/94] patch buggy USO site pagination links in category mode

---
 install.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/install.js b/install.js
index 12a433c1..faba121c 100644
--- a/install.js
+++ b/install.js
@@ -91,9 +91,29 @@ document.documentElement.appendChild(document.createElement('script')).text = '(
     };
   } + ')()';
 
+// TODO: remove the following statement when USO pagination is fixed
+if (location.search.includes('category=')) {
+  document.addEventListener('DOMContentLoaded', function _() {
+    document.removeEventListener('DOMContentLoaded', _);
+    new MutationObserver((_, observer) => {
+      if (!document.getElementById('pagination')) {
+        return;
+      }
+      observer.disconnect();
+      const category = '&' + location.search.match(/category=[^&]+/)[0];
+      const links = document.querySelectorAll('#pagination a[href*="page="]:not([href*="category="])');
+      for (let i = 0; i < links.length; i++) {
+        links[i].href += category;
+      }
+    }).observe(document, {childList: true, subtree: true});
+  });
+}
+
 new MutationObserver((mutations, observer) => {
   if (document.body) {
     observer.disconnect();
+    // TODO: remove the following statement when USO pagination title is fixed
+    document.title = document.title.replace(/^\d+&category=/, '');
     chrome.runtime.sendMessage({
       method: 'getStyles',
       url: getMeta('stylish-id-url') || location.href

From 90275ae47aa835458fed675c3b2b53502d707786 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 14 Jun 2017 00:20:35 +0300
Subject: [PATCH 24/94] Help buggy USO support Linux Chromium

---
 install.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install.js b/install.js
index faba121c..b4738c2b 100644
--- a/install.js
+++ b/install.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const CHROMIUM = /Chromium/.test(navigator.userAgent); // non-Windows Chromium
 const FIREFOX = /Firefox/.test(navigator.userAgent);
 const VIVALDI = /Vivaldi/.test(navigator.userAgent);
 const OPERA = /OPR/.test(navigator.userAgent);
@@ -127,8 +128,8 @@ new MutationObserver((mutations, observer) => {
 */
 function getStyleURL () {
   const url = getMeta('stylish-code-chrome');
-
-  if (FIREFOX || OPERA || VIVALDI) {
+  // TODO: remove when USO is fixed
+  if (FIREFOX || OPERA || VIVALDI || CHROMIUM) {
     /* get custom settings from the update url */
     return Object.assign(new URL(url), {
       search: (new URL(getMeta('stylish-update-url'))).search

From c5a340e44e03f0f44ba85d0374105f85bae74c8e Mon Sep 17 00:00:00 2001
From: Jeremy Schomery <jeremy.schomery@yahoo.com>
Date: Wed, 14 Jun 2017 09:30:19 +0430
Subject: [PATCH 25/94] version 1.1.0

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index de82f459..7e6f1741 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Stylus",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "minimum_chrome_version": "49",
   "description": "__MSG_description__",
   "homepage_url": "http://add0n.com/stylus.html",

From b4e00cd892e09dff9e38802c00fdd0c6b0c0568e Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 17 Jun 2017 08:49:12 +0300
Subject: [PATCH 26/94] Lazify notifyAllTabs() and injectCS()

* notifyAllTabs: the active tab gets notified immediately, the rest lazily
* notifyAllTabs + injectCS: don't notify lazy-loaded tabs in FF
---
 background.js | 10 +++++++---
 messaging.js  | 30 +++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/background.js b/background.js
index eed9a9aa..976d4a82 100644
--- a/background.js
+++ b/background.js
@@ -202,9 +202,13 @@ contextMenus = Object.assign({
   };
 
   chrome.tabs.query({}, tabs =>
-    tabs.forEach(tab =>
-      contentScripts.forEach(cs =>
-        pingCS(cs, tab))));
+    tabs.forEach(tab => {
+      // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
+      if (!FIREFOX || tab.width) {
+        contentScripts.forEach(cs =>
+          setTimeout(pingCS, 0, cs, tab));
+      }
+    }));
 }
 
 
diff --git a/messaging.js b/messaging.js
index 5cf66013..93e053c0 100644
--- a/messaging.js
+++ b/messaging.js
@@ -62,18 +62,30 @@ function notifyAllTabs(msg) {
   const affectsPopup = affectsAll || msg.affects.popup;
   const affectsSelf = affectsPopup || msg.prefs;
   if (affectsTabs || affectsIcon) {
+    const notifyTab = tab => {
+      // own pages will be notified via runtime.sendMessage later
+      if ((affectsTabs || URLS.optionsUI.includes(tab.url))
+      && !(affectsSelf && tab.url.startsWith(URLS.ownOrigin))
+      // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
+      && (!FIREFOX || tab.width)) {
+        chrome.tabs.sendMessage(tab.id, msg);
+      }
+      if (affectsIcon && BG) {
+        BG.updateIcon(tab);
+      }
+    };
     // list all tabs including chrome-extension:// which can be ours
     chrome.tabs.query(affectsOwnOriginOnly ? {url: URLS.ownOrigin + '*'} : {}, tabs => {
-      for (const tab of tabs) {
-        // own pages will be notified via runtime.sendMessage later
-        if ((affectsTabs || URLS.optionsUI.includes(tab.url))
-        && !(affectsSelf && tab.url.startsWith(URLS.ownOrigin))) {
-          chrome.tabs.sendMessage(tab.id, msg);
+      getActiveTab().then(activeTab => {
+        const activeTabId = activeTab && activeTab.id;
+        for (const tab of tabs) {
+          if (tab.id === activeTabId) {
+            notifyTab(tab);
+          } else {
+            setTimeout(notifyTab, 0, tab);
+          }
         }
-        if (affectsIcon && BG) {
-          BG.updateIcon(tab);
-        }
-      }
+      });
     });
   }
   // notify self: the message no longer is sent to the origin in new Chrome

From fba85b36cc046f429e2a8f710fcf72fe2a654fac Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 17 Jun 2017 13:00:10 +0300
Subject: [PATCH 27/94] promisify chrome.tabs.query as queryTabs()

---
 .eslintrc              |  1 +
 background.js          |  2 +-
 backup/fileSaveLoad.js |  2 +-
 edit.js                |  4 ++--
 messaging.js           | 35 +++++++++++++++++++++--------------
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 24b34542..b52a054d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -16,6 +16,7 @@ globals:
   URLS: false
   BG: false
   notifyAllTabs: false
+  queryTabs: false
   getTab: false
   getActiveTab: false
   getActiveTabRealURL: false
diff --git a/background.js b/background.js
index 976d4a82..ea7db689 100644
--- a/background.js
+++ b/background.js
@@ -201,7 +201,7 @@ contextMenus = Object.assign({
     });
   };
 
-  chrome.tabs.query({}, tabs =>
+  queryTabs().then(tabs =>
     tabs.forEach(tab => {
       // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
       if (!FIREFOX || tab.width) {
diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index ab57ca70..d0c946a2 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -270,7 +270,7 @@ function importFromString(jsonString) {
   function refreshAllTabs() {
     return getActiveTab().then(activeTab => new Promise(resolve => {
       // list all tabs including chrome-extension:// which can be ours
-      chrome.tabs.query({}, tabs => {
+      queryTabs().then(tabs => {
         const lastTab = tabs[tabs.length - 1];
         for (const tab of tabs) {
           getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
diff --git a/edit.js b/edit.js
index 2f9ede93..119b22cd 100644
--- a/edit.js
+++ b/edit.js
@@ -420,7 +420,7 @@ document.addEventListener("wheel", function(event) {
 	}
 });
 
-chrome.tabs.query({currentWindow: true}, function(tabs) {
+queryTabs({currentWindow: true}).then(tabs => {
 	var windowId = tabs[0].windowId;
 	if (prefs.get("openEditInWindow")) {
 		if (sessionStorage.saveSizeOnClose
@@ -1720,7 +1720,7 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
 			chrome.tabs.onUpdated.removeListener(_);
 		}
 	});
-	chrome.tabs.query({}, tabs => {
+	queryTabs().then(tabs => {
 		const supported = tabs.map(tab => tab.url)
 			.filter(url => URLS.supported.test(url));
 		const unique = [...new Set(supported).values()];
diff --git a/messaging.js b/messaging.js
index 93e053c0..e0be522a 100644
--- a/messaging.js
+++ b/messaging.js
@@ -75,17 +75,18 @@ function notifyAllTabs(msg) {
       }
     };
     // list all tabs including chrome-extension:// which can be ours
-    chrome.tabs.query(affectsOwnOriginOnly ? {url: URLS.ownOrigin + '*'} : {}, tabs => {
-      getActiveTab().then(activeTab => {
-        const activeTabId = activeTab && activeTab.id;
-        for (const tab of tabs) {
-          if (tab.id === activeTabId) {
-            notifyTab(tab);
-          } else {
-            setTimeout(notifyTab, 0, tab);
-          }
+    Promise.all([
+      queryTabs(affectsOwnOriginOnly ? {url: URLS.ownOrigin + '*'} : {}),
+      getActiveTab(),
+    ]).then(([tabs, activeTab]) => {
+      const activeTabId = activeTab && activeTab.id;
+      for (const tab of tabs) {
+        if (tab.id === activeTabId) {
+          notifyTab(tab);
+        } else {
+          setTimeout(notifyTab, 0, tab);
         }
-      });
+      }
     });
   }
   // notify self: the message no longer is sent to the origin in new Chrome
@@ -103,6 +104,13 @@ function notifyAllTabs(msg) {
 }
 
 
+function queryTabs(options = {}) {
+  return new Promise(resolve =>
+    chrome.tabs.query(options, tabs =>
+      resolve(tabs)));
+}
+
+
 function getTab(id) {
   return new Promise(resolve =>
     chrome.tabs.get(id, tab =>
@@ -111,9 +119,8 @@ function getTab(id) {
 
 
 function getActiveTab() {
-  return new Promise(resolve =>
-    chrome.tabs.query({currentWindow: true, active: true}, tabs =>
-      resolve(tabs[0])));
+  return queryTabs({currentWindow: true, active: true})
+    .then(tabs => tabs[0]);
 }
 
 
@@ -148,7 +155,7 @@ function openURL({url, currentWindow = true}) {
     // FF doesn't handle moz-extension:// URLs (bug)
     // API doesn't handle the hash-fragment part
     const urlQuery = url.startsWith('moz-extension') ? undefined : url.replace(/#.*/, '');
-    chrome.tabs.query({url: urlQuery, currentWindow}, tabs => {
+    queryTabs({url: urlQuery, currentWindow}).then(tabs => {
       for (const tab of tabs) {
         if (tab.url == url) {
           activateTab(tab).then(resolve);

From 050109428c1f7c200b93474d3097597b036ebfb4 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 17 Jun 2017 14:55:34 +0300
Subject: [PATCH 28/94] USO bug workaround: generalize getStyleURL()

---
 install.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install.js b/install.js
index b4738c2b..f62af69f 100644
--- a/install.js
+++ b/install.js
@@ -129,10 +129,11 @@ new MutationObserver((mutations, observer) => {
 function getStyleURL () {
   const url = getMeta('stylish-code-chrome');
   // TODO: remove when USO is fixed
-  if (FIREFOX || OPERA || VIVALDI || CHROMIUM) {
+  const directUrl = getMeta('stylish-update-url');
+  if (directUrl.includes('?') && !url.includes('?')) {
     /* get custom settings from the update url */
     return Object.assign(new URL(url), {
-      search: (new URL(getMeta('stylish-update-url'))).search
+      search: (new URL(directUrl)).search
     }).href;
   }
   return url;

From c4f871b4ed94e6746823eedfe24e7943f1096f78 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 18 Jun 2017 12:27:00 +0300
Subject: [PATCH 29/94] editor: use MouseEvent.pageY in resizeGrip

---
 edit.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/edit.js b/edit.js
index 119b22cd..ad3e763b 100644
--- a/edit.js
+++ b/edit.js
@@ -360,9 +360,13 @@ function setupCodeMirror(textarea, index) {
 		var cm = e.target.parentNode.CodeMirror;
 		var minHeight = cm.defaultTextHeight()
 			+ cm.display.lineDiv.offsetParent.offsetTop /* .CodeMirror-lines padding */
-			+ cm.display.wrapper.offsetHeight - cm.display.wrapper.scrollHeight /* borders */;
+			+ cm.display.wrapper.offsetHeight - cm.display.wrapper.clientHeight /* borders */;
 		function resize(e) {
-			cm.setSize(null, Math.max(minHeight, cm.display.wrapper.scrollHeight + e.movementY));
+			const cmPageY = cm.display.wrapper.getBoundingClientRect().top + window.scrollY;
+			const height = Math.max(minHeight, e.pageY - cmPageY);
+			if (height != cm.display.wrapper.clientHeight) {
+				cm.setSize(null, height);
+			}
 		}
 		document.addEventListener("mousemove", resize);
 		document.addEventListener("mouseup", function resizeStop() {

From 3128c7f06333815024f852a5994987ce39000d4b Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 18 Jun 2017 12:28:39 +0300
Subject: [PATCH 30/94] editor: keep 's-resize' cursor over code box

---
 edit.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/edit.js b/edit.js
index ad3e763b..060218f6 100644
--- a/edit.js
+++ b/edit.js
@@ -361,6 +361,8 @@ function setupCodeMirror(textarea, index) {
 		var minHeight = cm.defaultTextHeight()
 			+ cm.display.lineDiv.offsetParent.offsetTop /* .CodeMirror-lines padding */
 			+ cm.display.wrapper.offsetHeight - cm.display.wrapper.clientHeight /* borders */;
+		cm.display.wrapper.style.pointerEvents = 'none';
+		document.body.style.cursor = 's-resize';
 		function resize(e) {
 			const cmPageY = cm.display.wrapper.getBoundingClientRect().top + window.scrollY;
 			const height = Math.max(minHeight, e.pageY - cmPageY);
@@ -372,6 +374,8 @@ function setupCodeMirror(textarea, index) {
 		document.addEventListener("mouseup", function resizeStop() {
 			document.removeEventListener("mouseup", resizeStop);
 			document.removeEventListener("mousemove", resize);
+			cm.display.wrapper.style.pointerEvents = '';
+			document.body.style.cursor = '';
 		});
 	});
 	// resizeGrip has enough space when scrollbars.horiz is visible

From 8e4b2fbbb0c645396d5387a15b9bac7a2ff6cc3b Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 18 Jun 2017 15:46:53 +0300
Subject: [PATCH 31/94] manage: hardcode edit link; fixes #29 broken in
 7084dd12

---
 manage.html | 6 +++---
 manage.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manage.html b/manage.html
index eb405e0a..d23e8985 100644
--- a/manage.html
+++ b/manage.html
@@ -17,7 +17,7 @@
   <template data-id="style">
     <div class="entry">
       <h2 class="style-name">
-        <a class="style-name-link" href="edit.html?id="></a>
+        <a class="style-name-link"></a>
         <a target="_blank" class="homepage"></a>
       </h2>
       <p class="applies-to">
@@ -25,7 +25,7 @@
         <span class="targets"></span>
       </p>
       <p class="actions">
-        <a class="style-edit-link" href="edit.html?id=">
+        <a class="style-edit-link">
           <button i18n-text="editStyleLabel"></button>
         </a>
         <button class="enable" i18n-text="enableStyleLabel"></button>
@@ -42,7 +42,7 @@
     <div class="entry">
       <h2 class="style-name">
         <input class="checker" type="checkbox" i18n-title="toggleStyle">
-        <a class="style-name-link" href="edit.html?id="></a>
+        <a class="style-name-link"></a>
       </h2>
       <p class="actions">
         <a target="_blank" class="homepage"></a>
diff --git a/manage.js b/manage.js
index 61829014..724f1127 100644
--- a/manage.js
+++ b/manage.js
@@ -155,7 +155,7 @@ function createStyleElement({style, name}) {
       checker: $('.checker', entry) || {},
       nameLink: $('.style-name-link', entry),
       editLink: $('.style-edit-link', entry) || {},
-      editHrefBase: $('.style-name-link', entry).getAttribute('href'),
+      editHrefBase: 'edit.html?id=',
       homepage: $('.homepage', entry),
       homepageIcon: template[`homepageIcon${newUI.enabled ? 'Small' : 'Big'}`],
       appliesTo: $('.applies-to', entry),

From f603d9b61fb00215f87fec2988e6ef70d2d584d8 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 18 Jun 2017 14:04:18 +0300
Subject: [PATCH 32/94] simplify html for editor options: reuse the id

---
 edit.html | 22 +++++++++++-----------
 edit.js   |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/edit.html b/edit.html
index a263cc66..e3d9ae4c 100644
--- a/edit.html
+++ b/edit.html
@@ -210,13 +210,13 @@
 			.CodeMirror-search-hint {
 				color: #888;
 			}
-			body[data-highlight-selection-matches="token"] .cm-matchhighlight-approved .cm-matchhighlight,
-			body[data-highlight-selection-matches="token"] .CodeMirror-selection-highlight-scrollbar {
+			body[data-match-highlight="token"] .cm-matchhighlight-approved .cm-matchhighlight,
+			body[data-match-highlight="token"] .CodeMirror-selection-highlight-scrollbar {
 				animation: fadein-match-highlighter 1s cubic-bezier(.97,.01,.42,.98);
 				animation-fill-mode: both;
 			}
-			body[data-highlight-selection-matches="selection"] .cm-matchhighlight-approved .cm-matchhighlight,
-			body[data-highlight-selection-matches="selection"] .CodeMirror-selection-highlight-scrollbar {
+			body[data-match-highlight="selection"] .cm-matchhighlight-approved .cm-matchhighlight,
+			body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar {
 				background-color: rgba(1, 151, 193, 0.1);
 			}
 			@-webkit-keyframes highlight {
@@ -693,33 +693,33 @@
 			<section id="options">
 				<h2 id="options-heading" i18n-text="optionsHeading"></h2>
 				<div class="option">
-					<input data-option="lineWrapping" id="editor.lineWrapping" type="checkbox">
+					<input id="editor.lineWrapping" type="checkbox">
 					<label id="lineWrapping-label" for="editor.lineWrapping" i18n-text="cm_lineWrapping"></label>
 				</div>
 				<div class="option">
-					<input data-option="smartIndent" id="editor.smartIndent" type="checkbox">
+					<input id="editor.smartIndent" type="checkbox">
 					<label id="smartIndent-label" for="editor.smartIndent" i18n-text="cm_smartIndent"></label>
 				</div>
 				<div class="option">
-					<input data-option="indentWithTabs" id="editor.indentWithTabs" type="checkbox">
+					<input id="editor.indentWithTabs" type="checkbox">
 					<label id="indentWithTabs-label" for="editor.indentWithTabs" i18n-text="cm_indentWithTabs"></label>
 				</div>
 				<div class="option aligned">
 					<label id="tabSize-label" for="editor.tabSize" i18n-text="cm_tabSize"></label>
-					<input data-option="tabSize" id="editor.tabSize" type="number" min="0">
+					<input id="editor.tabSize" type="number" min="0">
 				</div>
 				<div class="option aligned">
 					<label id="keyMap-label" for="editor.keyMap" i18n-text="cm_keyMap"></label>
-					<select data-option="keyMap" id="editor.keyMap"></select>
+					<select id="editor.keyMap"></select>
 					<svg id="keyMap-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg>
 				</div>
 				<div class="option aligned">
 					<label id="theme-label" for="editor.theme" i18n-text="cm_theme"></label>
-					<select data-option="theme" id="editor.theme"></select>
+					<select id="editor.theme"></select>
 				</div>
 				<div class="option aligned">
 					<label id="highlight-label" for="editor.matchHighlight" i18n-text="cm_matchHighlight"></label>
-					<select data-option="highlightSelectionMatches" id="editor.matchHighlight">
+					<select id="editor.matchHighlight">
 						<option i18n-text="cm_matchHighlightToken" value="token">
 						<option i18n-text="cm_matchHighlightSelection" value="selection">
 						<option i18n-text="genericDisabledLabel" value="">
diff --git a/edit.js b/edit.js
index 060218f6..3f939c58 100644
--- a/edit.js
+++ b/edit.js
@@ -281,7 +281,7 @@ function initCodeMirror() {
 
 function acmeEventListener(event) {
 	var el = event.target;
-	var option = el.dataset.option;
+	var option = el.id.replace(/^editor\./, '');
 	//console.log("acmeEventListener heard %s on %s", event.type, el.id);
 	if (!option) {
 		console.error("acmeEventListener: no 'cm_option' %O", el);
@@ -319,7 +319,7 @@ function acmeEventListener(event) {
 				}, 100);
 			})();
 			return;
-		case "highlightSelectionMatches":
+		case "matchHighlight":
 			switch (value) {
 				case 'token':
 				case 'selection':

From 7443a4cb892a53929e09af6e40b90c68de4dc899 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 18 Jun 2017 15:20:11 +0300
Subject: [PATCH 33/94] ensure BG is initialized in onBackgroundReady()

---
 messaging.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/messaging.js b/messaging.js
index e0be522a..83c4543a 100644
--- a/messaging.js
+++ b/messaging.js
@@ -296,17 +296,16 @@ function sessionStorageHash(name) {
 
 
 function onBackgroundReady() {
-  return BG ? Promise.resolve() : new Promise(ping);
-  function ping(resolve) {
+  return BG && BG.getStyles ? Promise.resolve() : new Promise(function ping(resolve) {
     chrome.runtime.sendMessage({method: 'healthCheck'}, health => {
       if (health !== undefined) {
         BG = chrome.extension.getBackgroundPage();
         resolve();
       } else {
-        ping(resolve);
+        setTimeout(ping, 0, resolve);
       }
     });
-  }
+  });
 }
 
 

From 2240a0895ee1d392247ff42f764ebd87b9b36299 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 18 Jun 2017 15:20:48 +0300
Subject: [PATCH 34/94] editor: autocomplete on typing

---
 _locales/en/messages.json |  4 ++++
 edit.html                 |  4 ++++
 edit.js                   | 40 +++++++++++++++++++++++++++++++++++++++
 prefs.js                  |  1 +
 4 files changed, 49 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index a5b7c4fe..584bb716 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -91,6 +91,10 @@
     "message": "Checking...",
     "description": "Text to display when checking a style for an update"
   },
+  "cm_autocompleteOnTyping": {
+    "message": "Autocomplete on typing",
+    "description": "Label for the checkbox in the style editor."
+  },
   "cm_indentWithTabs": {
     "message": "Use tabs with smart indentation",
     "description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
diff --git a/edit.html b/edit.html
index e3d9ae4c..c8ae2927 100644
--- a/edit.html
+++ b/edit.html
@@ -704,6 +704,10 @@
 					<input id="editor.indentWithTabs" type="checkbox">
 					<label id="indentWithTabs-label" for="editor.indentWithTabs" i18n-text="cm_indentWithTabs"></label>
 				</div>
+				<div class="option">
+					<input id="editor.autocompleteOnTyping" type="checkbox">
+					<label for="editor.autocompleteOnTyping" i18n-text="cm_autocompleteOnTyping"></label>
+				</div>
 				<div class="option aligned">
 					<label id="tabSize-label" for="editor.tabSize" i18n-text="cm_tabSize"></label>
 					<input id="editor.tabSize" type="number" min="0">
diff --git a/edit.js b/edit.js
index 3f939c58..f100b177 100644
--- a/edit.js
+++ b/edit.js
@@ -161,6 +161,7 @@ function initCodeMirror() {
 		gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter", "CodeMirror-lint-markers"],
 		matchBrackets: true,
 		highlightSelectionMatches: {showToken: /[#.\-\w]/, annotateScrollbar: true},
+		hintOptions: {},
 		lint: {getAnnotations: CodeMirror.lint.css, delay: prefs.get("editor.lintDelay")},
 		lintReportDelay: prefs.get("editor.lintReportDelay"),
 		styleActiveLine: true,
@@ -319,6 +320,13 @@ function acmeEventListener(event) {
 				}, 100);
 			})();
 			return;
+		case 'autocompleteOnTyping':
+			editors.forEach(cm => {
+				const onOff = el.checked ? 'on' : 'off';
+				cm[onOff]('change', autocompleteOnTyping);
+				cm[onOff]('pick', autocompletePicked);
+			});
+			return;
 		case "matchHighlight":
 			switch (value) {
 				case 'token':
@@ -338,6 +346,10 @@ function setupCodeMirror(textarea, index) {
 	var cm = CodeMirror.fromTextArea(textarea, {lint: null});
 
 	cm.on("change", indicateCodeChange);
+	if (prefs.get('editor.autocompleteOnTyping')) {
+		cm.on('change', autocompleteOnTyping);
+		cm.on('pick', autocompletePicked);
+	}
 	cm.on("blur", function(cm) {
 		editors.lastActive = cm;
 		hotkeyRerouter.setState(true);
@@ -874,6 +886,34 @@ function toggleStyle() {
 	save();
 }
 
+function autocompleteOnTyping(cm, info, debounced) {
+	if (cm.state.completionActive
+	|| info.origin && !info.origin.includes('input')
+	|| !info.text.last) {
+		return;
+	}
+	if (cm.state.autocompletePicked) {
+		cm.state.autocompletePicked = false;
+		return;
+	}
+	if (!debounced) {
+		debounce(autocompleteOnTyping, 100, cm, info, true);
+		return;
+	}
+	if (info.text.last.match(/[-\w!]+$/)) {
+		cm.state.autocompletePicked = false;
+		cm.options.hintOptions.completeSingle = false;
+		cm.execCommand('autocomplete');
+		setTimeout(() => {
+			cm.options.hintOptions.completeSingle = true;
+		});
+	}
+}
+
+function autocompletePicked(cm) {
+	cm.state.autocompletePicked = true;
+}
+
 function refocusMinidialog(cm) {
 	var section = cm.getSection();
 	if (!section.querySelector(".CodeMirror-dialog")) {
diff --git a/prefs.js b/prefs.js
index 00b74663..a84cb52d 100644
--- a/prefs.js
+++ b/prefs.js
@@ -44,6 +44,7 @@ var prefs = new function Prefs() {
     'editor.matchHighlight': 'token', // token = token/word under cursor even if nothing is selected
                                       // selection = only when something is selected
                                       // '' (empty string) = disabled
+    'editor.autocompleteOnTyping': false, // show autocomplete dropdown on typing a word token
     'editor.contextDelete': contextDeleteMissing(), // "Delete" item in context menu
 
     'badgeDisabled': '#8B0000',     // badge background color when disabled

From 5485fbf8b32780969292068e783160c57c8e86a6 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Mon, 19 Jun 2017 16:00:45 +0300
Subject: [PATCH 35/94] optionsUI: more flexboxes and relative widths

* also center the UI vertically in Opera
* allow body width to grow up to 800px in FF/Opera/etc
* use :: in pseudo selectors
---
 options/index.css | 46 ++++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/options/index.css b/options/index.css
index b1501ed7..8262040b 100644
--- a/options/index.css
+++ b/options/index.css
@@ -1,10 +1,12 @@
 html.opera {
-  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
 }
 
 html.opera body {
-  display: inline-block;
-  text-align: initial;
+  width: auto;
 }
 
 html.firefox .block {
@@ -19,7 +21,15 @@ body {
   margin: 0;
   font-family: "Helvetica Neue", Helvetica, sans-serif;
   font-size: 12px;
-  width: calc(16px + 100px + 8px + 260px + 8px + 60px + 4px + 16px);
+  width: 480px;
+  min-width: 400px;
+  max-width: 800px;
+}
+
+@media (min-width: 401px) {
+  .firefox body {
+    width: calc(100% - 6px); /* TODO: rework to avoid compensating padding of 'html.firefox .block'  */
+  }
 }
 
 .firefox .chromium-only {
@@ -31,7 +41,7 @@ body {
   align-items: center;
   margin: 1em 0;
   border-bottom: 1px dotted #ccc;
-  padding: 0 0 1em 16px;
+  padding: 0 16px 1em;
   position: relative;
 }
 
@@ -41,29 +51,31 @@ body {
 }
 
 h1 {
-  width: 100px;
+  width: 30%;
   margin: 0;
   font-size: 120%;
   font-weight: bold;
   padding-right: 8px;
+  box-sizing: border-box;
   word-wrap: break-word;
 }
 
+.items {
+  width: 70%;
+}
+
 label {
-  display: block;
-  white-space: nowrap;
+  display: flex;
   margin: .25ex 0;
 }
 
 label > * {
-  display: inline-block;
-  vertical-align: middle;
+  /*vertical-align: middle;*/
 }
 
 label > :first-child {
-  width: 260px;
-  white-space: normal;
   margin-right: 8px;
+  flex-grow: 1;
 }
 
 label:not([disabled]) > :first-child {
@@ -80,6 +92,7 @@ input[type="color"],
 .onoffswitch {
   width: 60px;
   box-sizing: border-box;
+  flex-shrink: 0;
 }
 
 a {
@@ -140,7 +153,7 @@ input[type="color"] {
   margin-top: 1px;
 }
 
-#updates-installed:after {
+#updates-installed::after {
   content: attr(data-value);
   margin-left: .5ex;
   font-weight: bold;
@@ -221,10 +234,11 @@ sup {
   box-shadow: inset 2px 2px 4px rgba(0,0,0,0.1);
 }
 
-.onoffswitch span:before {
+.onoffswitch span::before {
   content: "";
   display: block;
   width: 18px;
+  height: 18px;
   margin: -3px;
   background: #efefef;
   position: absolute;
@@ -239,7 +253,7 @@ sup {
   background-color: #CAEBE3;
 }
 
-.onoffswitch input:checked + span, .onoffswitch input:checked + span:before {
+.onoffswitch input:checked + span, .onoffswitch input:checked + span::before {
   border-color: #CAEBE3;
 }
 
@@ -247,7 +261,7 @@ sup {
   margin-left: 0;
 }
 
-.onoffswitch input:checked + span:before {
+.onoffswitch input:checked + span::before {
   right: 0;
   background-color: #04BA9F;
   box-shadow: 3px 6px 18px 0 rgba(0, 0, 0, 0.2);

From 028ac1d299d816a125b8e336c33dc089c6805fdb Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 21 Jun 2017 22:05:21 +0300
Subject: [PATCH 36/94] editor: convert string to int; fixes #102

---
 edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edit.js b/edit.js
index f100b177..f8e2cd01 100644
--- a/edit.js
+++ b/edit.js
@@ -291,7 +291,7 @@ function acmeEventListener(event) {
 	var value = el.type == "checkbox" ? el.checked : el.value;
 	switch (option) {
 		case "tabSize":
-			CodeMirror.setOption("indentUnit", value);
+			CodeMirror.setOption("indentUnit", Number(value));
 			break;
 		case "theme":
 			var themeLink = document.getElementById("cm-theme");

From c0fe8dbf43682ae4bb591d26a140df1ce433a5b1 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Thu, 22 Jun 2017 12:16:20 +0300
Subject: [PATCH 37/94] Move styles after <head> once it appears; fixes #103

---
 apply.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apply.js b/apply.js
index 54ff5047..ae25e788 100644
--- a/apply.js
+++ b/apply.js
@@ -12,6 +12,7 @@ var styleElements = new Map();
 var disabledElements = new Map();
 var retiredStyleTimers = new Map();
 var docRewriteObserver;
+var docHeadObserver;
 
 requestStyles();
 chrome.runtime.onMessage.addListener(applyOnMessage);
@@ -211,6 +212,17 @@ function applyStyles(styles) {
       }
     });
   }
+  // TODO: remove when https://bugzilla.mozilla.org/show_bug.cgi?id=1375358 is fixed
+  if (styleElements.size && !document.head && !docHeadObserver) {
+    docHeadObserver = new MutationObserver(() => {
+      docHeadObserver.disconnect();
+      docHeadObserver = null;
+      for (const el of styleElements.values()) {
+        ROOT.insertBefore(el, document.body);
+      }
+    });
+    docHeadObserver.observe(ROOT, {childList: true});
+  }
 }
 
 

From 93a4f4704f53f1fad9470fcabc445c0742889db8 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 25 Jun 2017 13:13:07 +0300
Subject: [PATCH 38/94] code cosmetics

---
 apply.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apply.js b/apply.js
index ae25e788..2d85356a 100644
--- a/apply.js
+++ b/apply.js
@@ -212,8 +212,8 @@ function applyStyles(styles) {
       }
     });
   }
-  // TODO: remove when https://bugzilla.mozilla.org/show_bug.cgi?id=1375358 is fixed
   if (styleElements.size && !document.head && !docHeadObserver) {
+    // HEAD is not yet present so we'll wait for it and move the style elements
     docHeadObserver = new MutationObserver(() => {
       docHeadObserver.disconnect();
       docHeadObserver = null;

From e3e1ecf2d3653eaa204a54975bdbf54ec2afd40e Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 25 Jun 2017 13:16:23 +0300
Subject: [PATCH 39/94] don't precompile regexps in storage.js (no gain)

---
 popup.js   | 18 ++++++++++++++++--
 storage.js | 32 ++------------------------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/popup.js b/popup.js
index 1e951533..20039c58 100644
--- a/popup.js
+++ b/popup.js
@@ -397,6 +397,21 @@ function handleDelete(id) {
   Additionally we'll check for invalid regexps.
 */
 function detectSloppyRegexps({entry, style}) {
+  // make sure all regexps are compiled
+  const rxCache = BG.cachedStyles.regexps;
+  for (const section of style.sections) {
+    for (const regexp of section.regexps) {
+      for (let pass = 1; pass <= 2; pass++) {
+        const cacheKey = pass == 1 ? regexp : BG.SLOPPY_REGEXP_PREFIX + regexp;
+        if (!rxCache.has(cacheKey)) {
+          // according to CSS4 @document specification the entire URL must match
+          const anchored = pass == 1 ? '^(?:' + regexp + ')$' : '^' + regexp + '$';
+          const rx = tryRegExp(anchored);
+          rxCache.set(cacheKey, rx || false);
+        }
+      }
+    }
+  }
   const {
     appliedSections =
       BG.getApplicableSections({style, matchUrl: tabURL}),
@@ -404,9 +419,8 @@ function detectSloppyRegexps({entry, style}) {
       BG.getApplicableSections({style, matchUrl: tabURL, strictRegexp: false}),
   } = style;
 
-  BG.compileStyleRegExps({style, compileAll: true});
   entry.hasInvalidRegexps = wannabeSections.some(section =>
-    section.regexps.some(rx => !BG.cachedStyles.regexps.has(rx)));
+    section.regexps.some(rx => !rxCache.has(rx)));
   entry.sectionsSkipped = wannabeSections.length - appliedSections.length;
 
   if (!appliedSections.length) {
diff --git a/storage.js b/storage.js
index c56fc4f8..0791d6b3 100644
--- a/storage.js
+++ b/storage.js
@@ -4,7 +4,8 @@ const RX_NAMESPACE = new RegExp([/[\s\r\n]*/,
   /(@namespace[\s\r\n]+(?:[^\s\r\n]+[\s\r\n]+)?url\(http:\/\/.*?\);)/,
   /[\s\r\n]*/].map(rx => rx.source).join(''), 'g');
 const RX_CSS_COMMENTS = /\/\*[\s\S]*?\*\//g;
-const SLOPPY_REGEXP_PREFIX = '\0';
+// eslint-disable-next-line no-var
+var SLOPPY_REGEXP_PREFIX = '\0';
 
 // Note, only 'var'-declared variables are visible from another extension page
 // eslint-disable-next-line no-var
@@ -88,13 +89,8 @@ function getStyles(options) {
   return dbExec('getAll').then(event => {
     cachedStyles.list = event.target.result || [];
     cachedStyles.byId.clear();
-    const t0 = performance.now();
-    let hasTimeToCompile = true;
     for (const style of cachedStyles.list) {
       cachedStyles.byId.set(style.id, style);
-      if (hasTimeToCompile) {
-        hasTimeToCompile = !compileStyleRegExps({style}) || performance.now() - t0 > 100;
-      }
     }
 
     cachedStyles.mutex.inProgress = false;
@@ -296,7 +292,6 @@ function saveStyle(style) {
     }
     style.id = style.id || event.target.result;
     invalidateCache(existed ? {updated: style} : {added: style});
-    compileStyleRegExps({style});
     if (notify) {
       notifyAllTabs({
         method: existed ? 'styleUpdated' : 'styleAdded',
@@ -463,29 +458,6 @@ function styleSectionsEqual({sections: a}, {sections: b}) {
 }
 
 
-function compileStyleRegExps({style, compileAll}) {
-  const t0 = performance.now();
-  for (const section of style.sections || []) {
-    for (const regexp of section.regexps) {
-      for (let pass = 1; pass <= (compileAll ? 2 : 1); pass++) {
-        const cacheKey = pass == 1 ? regexp : SLOPPY_REGEXP_PREFIX + regexp;
-        if (cachedStyles.regexps.has(cacheKey)) {
-          continue;
-        }
-        // according to CSS4 @document specification the entire URL must match
-        const anchored = pass == 1 ? '^(?:' + regexp + ')$' : '^' + regexp + '$';
-        const rx = tryRegExp(anchored);
-        cachedStyles.regexps.set(cacheKey, rx || false);
-        if (!compileAll && performance.now() - t0 > 100) {
-          return false;
-        }
-      }
-    }
-  }
-  return true;
-}
-
-
 function invalidateCache({added, updated, deletedId} = {}) {
   if (!cachedStyles.list) {
     return;

From e199e1b3c709beba238eca5b8a0fb16169237632 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 25 Jun 2017 18:17:52 +0300
Subject: [PATCH 40/94] FF-e10s bug workaround: do export via iframe

---
 backup/fileSaveLoad.js | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index d0c946a2..336273fa 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -302,12 +302,31 @@ $('#file-all-styles').onclick = () => {
     .then(res => res.blob())
     .then(blob => {
       const objectURL = URL.createObjectURL(blob);
-      Object.assign(document.createElement('a'), {
-        download: generateFileName(),
+      let link = $element({
+        tag:'a',
         href: objectURL,
         type: 'application/json',
-      }).dispatchEvent(new MouseEvent('click'));
-      setTimeout(() => URL.revokeObjectURL(objectURL));
+        download: generateFileName(),
+      });
+      // TODO: remove the fallback when FF multi-process bug is fixed
+      if (!FIREFOX) {
+        link.dispatchEvent(new MouseEvent('click'));
+        setTimeout(() => URL.revokeObjectURL(objectURL));
+      } else {
+        const iframe = document.body.appendChild($element({
+          tag: 'iframe',
+          style: 'width: 0; height: 0; position: fixed; opacity: 0;'.replace(/;/g, '!important;'),
+        }));
+        setTimeout(() => {
+          link = iframe.contentDocument.importNode(link, true);
+          iframe.contentDocument.body.appendChild(link);
+          link.dispatchEvent(new MouseEvent('click'));
+          setTimeout(() => {
+            URL.revokeObjectURL(objectURL);
+            iframe.remove();
+          }, 1000);
+        });
+      }
     });
 
   function generateFileName() {

From 9163a856f6a46aa32de390b6018109ea2e7f5f6b Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 27 Jun 2017 12:39:51 +0300
Subject: [PATCH 41/94] lazify and fix refreshAllTabs

---
 .eslintrc              |  1 +
 backup/fileSaveLoad.js | 22 +++++++++++++++++-----
 messaging.js           |  6 ++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index b52a054d..8256da07 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -18,6 +18,7 @@ globals:
   notifyAllTabs: false
   queryTabs: false
   getTab: false
+  getOwnTab: false
   getActiveTab: false
   getActiveTabRealURL: false
   getTabRealURL: false
diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index 336273fa..5bf027a5 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -217,7 +217,7 @@ function importFromString(jsonString) {
     return new Promise(resolve_ => {
       resolve = resolve_;
       undoNextId();
-    }).then(BG.refreshAllTabs)
+    }).then(refreshAllTabs)
       .then(() => messageBox({
         title: t('importReportUndoneTitle'),
         contents: newIds.length + ' ' + t('importReportUndone'),
@@ -268,19 +268,31 @@ function importFromString(jsonString) {
   }
 
   function refreshAllTabs() {
-    return getActiveTab().then(activeTab => new Promise(resolve => {
+    return Promise.all([
+      getActiveTab(),
+      getOwnTab(),
+    ]).then(([activeTab, ownTab]) => new Promise(resolve => {
       // list all tabs including chrome-extension:// which can be ours
       queryTabs().then(tabs => {
         const lastTab = tabs[tabs.length - 1];
         for (const tab of tabs) {
+          // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
+          if (FIREFOX && !tab.width) {
+            if (tab == lastTab) {
+              resolve();
+            }
+            continue;
+          }
           getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
             const message = {method: 'styleReplaceAll', styles};
-            if (tab.id == activeTab.id) {
+            if (tab.id == ownTab.id) {
               applyOnMessage(message);
+            } else if (tab.id == activeTab.id) {
+              chrome.tabs.sendMessage(tab.id, message, ignoreChromeError);
             } else {
-              chrome.tabs.sendMessage(tab.id, message);
+              setTimeout(chrome.tabs.sendMessage, 0, tab.id, message, ignoreChromeError);
             }
-            BG.updateIcon(tab, styles);
+            setTimeout(BG.updateIcon, 0, tab, styles);
             if (tab == lastTab) {
               resolve();
             }
diff --git a/messaging.js b/messaging.js
index 83c4543a..cdee9fe0 100644
--- a/messaging.js
+++ b/messaging.js
@@ -118,6 +118,12 @@ function getTab(id) {
 }
 
 
+function getOwnTab() {
+  return new Promise(resolve =>
+    chrome.tabs.getCurrent(tab => resolve(tab)));
+}
+
+
 function getActiveTab() {
   return queryTabs({currentWindow: true, active: true})
     .then(tabs => tabs[0]);

From 1c1a9f280473375f1b9b8264b6bf1b2b4bf2bae2 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 27 Jun 2017 12:55:47 +0300
Subject: [PATCH 42/94] fixup e199e1b3 for non-e10s FF: moar timeouts!

---
 .eslintrc              |  1 +
 backup/fileSaveLoad.js | 14 ++++++++------
 messaging.js           |  7 +++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 8256da07..077ef42c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -37,6 +37,7 @@ globals:
   saveStyleSafe: false
   sessionStorageHash: false
   download: false
+  doTimeout: false
   # localization.js
   template: false
   t: false
diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index 5bf027a5..e8fd7de4 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -329,14 +329,16 @@ $('#file-all-styles').onclick = () => {
           tag: 'iframe',
           style: 'width: 0; height: 0; position: fixed; opacity: 0;'.replace(/;/g, '!important;'),
         }));
-        setTimeout(() => {
+        doTimeout().then(() => {
           link = iframe.contentDocument.importNode(link, true);
           iframe.contentDocument.body.appendChild(link);
-          link.dispatchEvent(new MouseEvent('click'));
-          setTimeout(() => {
-            URL.revokeObjectURL(objectURL);
-            iframe.remove();
-          }, 1000);
+        })
+        .then(doTimeout)
+        .then(() => link.dispatchEvent(new MouseEvent('click')))
+        .then(doTimeout(1000))
+        .then(() => {
+          URL.revokeObjectURL(objectURL);
+          iframe.remove();
         });
       }
     });
diff --git a/messaging.js b/messaging.js
index cdee9fe0..f7ffeea6 100644
--- a/messaging.js
+++ b/messaging.js
@@ -359,3 +359,10 @@ function download(url) {
     xhr.send(query);
   });
 }
+
+
+function doTimeout(ms = 0, ...args) {
+  return ms > 0
+    ? () => new Promise(resolve => setTimeout(resolve, ms, ...args))
+    : new Promise(resolve => setTimeout(resolve, 0, ...args));
+}

From 358e8e034ffda44df0f78f94507a9b98b794d578 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 27 Jun 2017 15:15:49 +0300
Subject: [PATCH 43/94] code cosmetics: add invokeOrPostpone()

---
 .eslintrc              |  1 +
 backup/fileSaveLoad.js |  5 ++---
 messaging.js           | 13 ++++++++-----
 popup.js               |  6 +-----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 077ef42c..af049f37 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -38,6 +38,7 @@ globals:
   sessionStorageHash: false
   download: false
   doTimeout: false
+  invokeOrPostpone: false
   # localization.js
   template: false
   t: false
diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index e8fd7de4..d44e978f 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -287,10 +287,9 @@ function importFromString(jsonString) {
             const message = {method: 'styleReplaceAll', styles};
             if (tab.id == ownTab.id) {
               applyOnMessage(message);
-            } else if (tab.id == activeTab.id) {
-              chrome.tabs.sendMessage(tab.id, message, ignoreChromeError);
             } else {
-              setTimeout(chrome.tabs.sendMessage, 0, tab.id, message, ignoreChromeError);
+              invokeOrPostpone(tab.id == activeTab.id,
+                chrome.tabs.sendMessage, tab.id, message, ignoreChromeError);
             }
             setTimeout(BG.updateIcon, 0, tab, styles);
             if (tab == lastTab) {
diff --git a/messaging.js b/messaging.js
index f7ffeea6..42f8b593 100644
--- a/messaging.js
+++ b/messaging.js
@@ -81,11 +81,7 @@ function notifyAllTabs(msg) {
     ]).then(([tabs, activeTab]) => {
       const activeTabId = activeTab && activeTab.id;
       for (const tab of tabs) {
-        if (tab.id === activeTabId) {
-          notifyTab(tab);
-        } else {
-          setTimeout(notifyTab, 0, tab);
-        }
+        invokeOrPostpone(tab.id === activeTabId, notifyTab, tab);
       }
     });
   }
@@ -366,3 +362,10 @@ function doTimeout(ms = 0, ...args) {
     ? () => new Promise(resolve => setTimeout(resolve, ms, ...args))
     : new Promise(resolve => setTimeout(resolve, 0, ...args));
 }
+
+
+function invokeOrPostpone(isInvoke, fn, ...args) {
+  return isInvoke
+    ? fn(...args)
+    : setTimeout(invokeOrPostpone, 0, true, fn, ...args);
+}
diff --git a/popup.js b/popup.js
index 20039c58..9c5e8e5c 100644
--- a/popup.js
+++ b/popup.js
@@ -246,11 +246,7 @@ function createStyleElement({
   $('.disable', entry).onclick = handleEvent.toggle;
   $('.delete', entry).onclick = handleEvent.delete;
 
-  if (postponeDetect) {
-    setTimeout(detectSloppyRegexps, 0, {entry, style});
-  } else {
-    detectSloppyRegexps({entry, style});
-  }
+  invokeOrPostpone(!postponeDetect, detectSloppyRegexps, {entry, style});
 
   const oldElement = $('#style-' + style.id);
   if (oldElement) {

From 65d625fddf66d02bbeb6c029445b6c5f2eeae63c Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 27 Jun 2017 15:17:52 +0300
Subject: [PATCH 44/94] code cosmetics: missed a debounce() case

---
 manage.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manage.js b/manage.js
index 724f1127..87e357c7 100644
--- a/manage.js
+++ b/manage.js
@@ -709,8 +709,7 @@ function searchStyles({immediately, container}) {
     return;
   }
   if (!immediately) {
-    clearTimeout(searchStyles.timeout);
-    searchStyles.timeout = setTimeout(searchStyles, 150, {immediately: true});
+    debounce(searchStyles, 150, {immediately: true});
     return;
   }
   searchElement.lastValue = query;

From 1aa5c11b10d29a852511f9bfbe1781dc09515286 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 27 Jun 2017 23:13:11 +0300
Subject: [PATCH 45/94] code cosmetics: entry id prefix => named constant

---
 manage.js | 15 +++++++++------
 popup.js  | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/manage.js b/manage.js
index 87e357c7..7589e8ff 100644
--- a/manage.js
+++ b/manage.js
@@ -7,6 +7,9 @@ const filtersSelector = {
   unhide: '',
 };
 
+const ENTRY_ID_PREFIX_RAW = 'style-';
+const ENTRY_ID_PREFIX = '#' + ENTRY_ID_PREFIX_RAW;
+
 const newUI = {
   enabled: prefs.get('manage.newUI'),
   favicons: prefs.get('manage.newUI.favicons'),
@@ -140,7 +143,7 @@ function showStyles(styles = []) {
     if (newUI.enabled && newUI.favicons) {
       debounce(handleEvent.loadFavicons, 16);
     }
-  }
+      }
 }
 
 
@@ -175,7 +178,7 @@ function createStyleElement({style, name}) {
   parts.homepage.href = parts.homepage.title = style.url || '';
 
   const entry = parts.entry.cloneNode(true);
-  entry.id = 'style-' + style.id;
+  entry.id = ENTRY_ID_PREFIX_RAW + style.id;
   entry.styleId = style.id;
   entry.styleNameLowerCase = name || style.name.toLocaleLowerCase();
   entry.styleMeta = getStyleWithNoCode(style);
@@ -400,7 +403,7 @@ Object.assign(handleEvent, {
 
 function handleUpdate(style, {reason, method} = {}) {
   let entry;
-  let oldEntry = $('#style-' + style.id);
+  let oldEntry = $(ENTRY_ID_PREFIX + style.id);
   if (oldEntry && method == 'styleUpdated') {
     handleToggledOrCodeOnly();
   }
@@ -449,7 +452,7 @@ function handleUpdate(style, {reason, method} = {}) {
 
 
 function handleDelete(id) {
-  const node = $('#style-' + id);
+  const node = $(ENTRY_ID_PREFIX + id);
   if (node) {
     node.remove();
     if (node.matches('.can-update')) {
@@ -519,7 +522,7 @@ function switchUI({styleOnly} = {}) {
   if (missingFavicons) {
     getStylesSafe().then(styles => {
       for (const style of styles) {
-        const entry = $('#style-' + style.id);
+        const entry = $(ENTRY_ID_PREFIX + style.id);
         if (entry) {
           createStyleTargetsElement({entry, style, postponeFavicons: true});
         }
@@ -621,7 +624,7 @@ function checkUpdate(entry, {single = true} = {}) {
 
 
 function reportUpdateState(state, style, details) {
-  const entry = $('#style-' + style.id);
+  const entry = $(ENTRY_ID_PREFIX + style.id);
   entry.classList.remove('checking-update');
   switch (state) {
     case BG.updater.UPDATED:
diff --git a/popup.js b/popup.js
index 9c5e8e5c..f82b978f 100644
--- a/popup.js
+++ b/popup.js
@@ -5,6 +5,9 @@ let installed;
 let tabURL;
 const handleEvent = {};
 
+const ENTRY_ID_PREFIX_RAW = 'style-';
+const ENTRY_ID_PREFIX = '#' + ENTRY_ID_PREFIX_RAW;
+
 getActiveTabRealURL().then(url => {
   tabURL = URLS.supported.test(url) ? url : '';
   Promise.all([
@@ -215,7 +218,7 @@ function createStyleElement({
   const entry = template.style.cloneNode(true);
   entry.setAttribute('style-id', style.id);
   Object.assign(entry, {
-    id: 'style-' + style.id,
+    id: ENTRY_ID_PREFIX_RAW + style.id,
     styleId: style.id,
     className: entry.className + ' ' + (style.enabled ? 'enabled' : 'disabled'),
     onmousedown: handleEvent.maybeEdit,
@@ -223,7 +226,7 @@ function createStyleElement({
 
   const checkbox = $('.checker', entry);
   Object.assign(checkbox, {
-    id: 'style-' + style.id,
+    id: ENTRY_ID_PREFIX_RAW + style.id,
     checked: style.enabled,
     onclick: handleEvent.toggle,
   });
@@ -236,7 +239,7 @@ function createStyleElement({
 
   const styleName = $('.style-name', entry);
   Object.assign(styleName, {
-    htmlFor: 'style-' + style.id,
+    htmlFor: ENTRY_ID_PREFIX_RAW + style.id,
     onclick: handleEvent.name,
   });
   styleName.checkbox = checkbox;
@@ -248,7 +251,7 @@ function createStyleElement({
 
   invokeOrPostpone(!postponeDetect, detectSloppyRegexps, {entry, style});
 
-  const oldElement = $('#style-' + style.id);
+  const oldElement = $(ENTRY_ID_PREFIX + style.id);
   if (oldElement) {
     oldElement.parentNode.replaceChild(entry, oldElement);
   } else {
@@ -368,7 +371,7 @@ Object.assign(handleEvent, {
 
 
 function handleUpdate(style) {
-  if ($('#style-' + style.id)) {
+  if ($(ENTRY_ID_PREFIX + style.id)) {
     createStyleElement({style});
     return;
   }
@@ -381,7 +384,7 @@ function handleUpdate(style) {
 
 
 function handleDelete(id) {
-  $$('#style-' + id).forEach(el => el.remove());
+  $$(ENTRY_ID_PREFIX + id).forEach(el => el.remove());
 }
 
 

From dc846aa7dda7a91c15837838405984db9d50572a Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 27 Jun 2017 23:00:24 +0300
Subject: [PATCH 46/94] code cosmetics: animateElement() 'highlight' by default

---
 backup/fileSaveLoad.js | 2 +-
 dom.js                 | 9 +++++++--
 manage.js              | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index d44e978f..4ac993ec 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -246,7 +246,7 @@ function importFromString(jsonString) {
       const styleElement = $('#style-' + event.target.dataset.id);
       if (styleElement) {
         scrollElementIntoView(styleElement);
-        animateElement(styleElement, {className: 'highlight'});
+        animateElement(styleElement);
       }
     };
     for (const block of $$('details')) {
diff --git a/dom.js b/dom.js
index b1443562..139619cc 100644
--- a/dom.js
+++ b/dom.js
@@ -46,8 +46,13 @@ function scrollElementIntoView(element) {
 }
 
 
-function animateElement(element, {className, removeExtraClasses = [], remove = false}) {
-  return new Promise(resolve => {
+function animateElement(
+  element, {
+    className = 'highlight',
+    removeExtraClasses = [],
+    remove = false,
+  } = {}) {
+  return element && new Promise(resolve => {
     element.addEventListener('animationend', function _() {
       element.removeEventListener('animationend', _);
       element.classList.remove(
diff --git a/manage.js b/manage.js
index 7589e8ff..09a4063e 100644
--- a/manage.js
+++ b/manage.js
@@ -342,7 +342,7 @@ Object.assign(handleEvent, {
   delete(event, entry) {
     const id = entry.styleId;
     const {name} = BG.cachedStyles.byId.get(id) || {};
-    animateElement(entry, {className: 'highlight'});
+    animateElement(entry);
     messageBox({
       title: t('deleteStyleConfirm'),
       contents: name,
@@ -420,7 +420,7 @@ function handleUpdate(style, {reason, method} = {}) {
   }
   filterAndAppend({entry});
   if (!entry.matches('.hidden') && reason != 'import') {
-    animateElement(entry, {className: 'highlight'});
+    animateElement(entry);
     scrollElementIntoView(entry);
   }
 

From 9299972a3482902aa2e9a2aeffe4a5ad14a9084f Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 27 Jun 2017 23:01:17 +0300
Subject: [PATCH 47/94] editor: highlight style entry upon "back to manage"

---
 edit.js   |  2 ++
 manage.js | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/edit.js b/edit.js
index f8e2cd01..61c1e9f8 100644
--- a/edit.js
+++ b/edit.js
@@ -477,6 +477,8 @@ function goBackToManage(event) {
 		event.stopPropagation();
 		event.preventDefault();
 		history.back();
+	} else if (styleId) {
+		sessionStorage.justEditedStyleId = styleId;
 	}
 }
 
diff --git a/manage.js b/manage.js
index 09a4063e..da268c6b 100644
--- a/manage.js
+++ b/manage.js
@@ -117,7 +117,7 @@ function showStyles(styles = []) {
     .sort((a, b) => (a.name < b.name ? -1 : a.name == b.name ? 0 : 1));
   let index = 0;
   const scrollY = (history.state || {}).scrollY;
-  const shouldRenderAll = scrollY > window.innerHeight;
+  const shouldRenderAll = scrollY > window.innerHeight || sessionStorage.justEditedStyleId;
   const renderBin = document.createDocumentFragment();
   if (scrollY) {
     renderStyles();
@@ -143,7 +143,15 @@ function showStyles(styles = []) {
     if (newUI.enabled && newUI.favicons) {
       debounce(handleEvent.loadFavicons, 16);
     }
+    if (sessionStorage.justEditedStyleId) {
+      const entry = $(ENTRY_ID_PREFIX + sessionStorage.justEditedStyleId);
+      delete sessionStorage.justEditedStyleId;
+      if (entry) {
+        animateElement(entry);
+        scrollElementIntoView(entry);
       }
+    }
+  }
 }
 
 

From 9ffc5253915afa9afe80e504a1ed983646c0ecc5 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 27 Jun 2017 18:55:17 +0300
Subject: [PATCH 48/94] editor: horizontal resize grip

---
 edit.html | 33 +++++++++++++++++++++++++++------
 edit.js   | 14 --------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/edit.html b/edit.html
index c8ae2927..d770fd14 100644
--- a/edit.html
+++ b/edit.html
@@ -192,7 +192,13 @@
 				background: none;
 			}
 			.CodeMirror-vscrollbar {
-				margin-bottom: 8px; /* make space for resize-grip */
+				margin-bottom: 7px; /* make space for resize-grip */
+			}
+			.CodeMirror-hscrollbar {
+		  		bottom: 7px; /* make space for resize-grip */
+			}
+			.CodeMirror-scrollbar-filler {
+				bottom: 7px; /* make space for resize-grip */
 			}
 			.CodeMirror-dialog {
 				-webkit-animation: highlight 3s ease-out;
@@ -242,14 +248,29 @@
 			.resize-grip {
 				position: absolute;
 				display: block;
-				width: 8px;
-				height: 8px;
-				content: " ";
+				height: 6px;
+				content: "";
+				left: 0;
 				right: 0;
 				bottom: 0;
-				z-index: 99;
+				z-index: 9;
 				cursor: n-resize;
-				background: linear-gradient(-45deg, transparent 2px, rgba(0,0,0,0.5) 2px, transparent 3px, transparent 4.5px, rgba(0,0,0,0.5) 5px, transparent 5.5px);
+				background-color: inherit;
+				border-top-width: 1px;
+				border-top-style: solid;
+				border-top-color: inherit;
+			}
+			.resize-grip:after {
+				content: "";
+				bottom: 2px;
+				left: 0;
+				right: 0;
+				margin: 0 8px;
+				display: block;
+				position: absolute;
+				border-top-width: 2px;
+				border-top-style: dotted;
+				border-top-color: inherit;
 			}
 			/* applies-to */
 			.applies-to {
diff --git a/edit.js b/edit.js
index 61c1e9f8..bd60f56f 100644
--- a/edit.js
+++ b/edit.js
@@ -390,20 +390,6 @@ function setupCodeMirror(textarea, index) {
 			document.body.style.cursor = '';
 		});
 	});
-	// resizeGrip has enough space when scrollbars.horiz is visible
-	if (cm.display.scrollbars.horiz.style.display != "") {
-		cm.display.scrollbars.vert.style.marginBottom = "0";
-	}
-	// resizeGrip space adjustment in case a long line was entered/deleted by a user
-	new MutationObserver(function(mutations) {
-		var hScrollbar = mutations[0].target;
-		var hScrollbarVisible = hScrollbar.style.display != "";
-		var vScrollbar = hScrollbar.parentNode.CodeMirror.display.scrollbars.vert;
-		vScrollbar.style.marginBottom = hScrollbarVisible ? "0" : "";
-	}).observe(cm.display.scrollbars.horiz, {
-		attributes: true,
-		attributeFilter: ["style"]
-	});
 
 	editors.splice(index || editors.length, 0, cm);
 	return cm;

From 565f23fa6ef0e1632e129001ffbd6537099805a5 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 28 Jun 2017 09:09:29 +0300
Subject: [PATCH 49/94] editor: add double-click to resize grip

---
 _locales/en/messages.json |  4 ++
 edit.html                 |  3 ++
 edit.js                   | 80 ++++++++++++++++++++++++++-------------
 3 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 584bb716..c6a336cf 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -131,6 +131,10 @@
     "message": "Selection only",
     "description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
   },
+  "cm_resizeGripHint": {
+    "message": "Double-click to maximize/restore the height",
+    "description": "Tooltip for the resize grip in style editor"
+  },
   "genericDisabledLabel": {
     "message": "Disabled",
     "description": "Used in various lists/options to indicate that something is disabled"
diff --git a/edit.html b/edit.html
index d770fd14..2bfbd888 100644
--- a/edit.html
+++ b/edit.html
@@ -681,6 +681,9 @@
 		<template data-id="regexpTestPartial">
 			<a target="_blank" href="https://github.com/stylish-userstyles/stylish/wiki/Applying-styles-to-specific-sites#advanced-matching-with-regular-expressions"><svg class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></a>
 		</template>
+		<template data-id="resizeGrip">
+			<div class="resize-grip" i18n-title="cm_resizeGripHint"></div>
+		</template>
 	</head>
 
 	<body id="stylus-edit">
diff --git a/edit.js b/edit.js
index bd60f56f..d84261b0 100644
--- a/edit.js
+++ b/edit.js
@@ -343,53 +343,60 @@ function acmeEventListener(event) {
 
 // replace given textarea with the CodeMirror editor
 function setupCodeMirror(textarea, index) {
-	var cm = CodeMirror.fromTextArea(textarea, {lint: null});
+	const cm = CodeMirror.fromTextArea(textarea, {lint: null});
+	const wrapper = cm.display.wrapper;
 
-	cm.on("change", indicateCodeChange);
+	cm.on('change', indicateCodeChange);
 	if (prefs.get('editor.autocompleteOnTyping')) {
 		cm.on('change', autocompleteOnTyping);
 		cm.on('pick', autocompletePicked);
 	}
-	cm.on("blur", function(cm) {
+	cm.on('blur', () => {
 		editors.lastActive = cm;
 		hotkeyRerouter.setState(true);
-		setTimeout(function() {
-			var cm = editors.lastActive;
-			var childFocused = cm.display.wrapper.contains(document.activeElement);
-			cm.display.wrapper.classList.toggle("CodeMirror-active", childFocused);
-		}, 0);
+		setTimeout(() => {
+			wrapper.classList.toggle('CodeMirror-active', wrapper.contains(document.activeElement));
+		});
 	});
-	cm.on("focus", function() {
+	cm.on('focus', () => {
 		hotkeyRerouter.setState(false);
-		cm.display.wrapper.classList.add("CodeMirror-active");
+		wrapper.classList.add('CodeMirror-active');
 	});
 	cm.on('mousedown', (cm, event) => toggleContextMenuDelete.call(cm, event));
 
-	var resizeGrip = cm.display.wrapper.appendChild(document.createElement("div"));
-	resizeGrip.className = "resize-grip";
-	resizeGrip.addEventListener("mousedown", function(e) {
-		e.preventDefault();
-		var cm = e.target.parentNode.CodeMirror;
-		var minHeight = cm.defaultTextHeight()
+	let lastClickTime = 0;
+	const resizeGrip = wrapper.appendChild(template.resizeGrip.cloneNode(true));
+	resizeGrip.onmousedown = event => {
+		if (event.button != 0) {
+			return;
+		}
+		event.preventDefault();
+		if (Date.now() - lastClickTime < 500) {
+			lastClickTime = 0;
+			toggleSectionHeight(cm);
+			return;
+		}
+		lastClickTime = Date.now();
+		const minHeight = cm.defaultTextHeight()
 			+ cm.display.lineDiv.offsetParent.offsetTop /* .CodeMirror-lines padding */
-			+ cm.display.wrapper.offsetHeight - cm.display.wrapper.clientHeight /* borders */;
-		cm.display.wrapper.style.pointerEvents = 'none';
+			+ wrapper.offsetHeight - wrapper.clientHeight /* borders */;
+		wrapper.style.pointerEvents = 'none';
 		document.body.style.cursor = 's-resize';
 		function resize(e) {
-			const cmPageY = cm.display.wrapper.getBoundingClientRect().top + window.scrollY;
+			const cmPageY = wrapper.getBoundingClientRect().top + window.scrollY;
 			const height = Math.max(minHeight, e.pageY - cmPageY);
-			if (height != cm.display.wrapper.clientHeight) {
+			if (height != wrapper.clientHeight) {
 				cm.setSize(null, height);
 			}
 		}
-		document.addEventListener("mousemove", resize);
-		document.addEventListener("mouseup", function resizeStop() {
-			document.removeEventListener("mouseup", resizeStop);
-			document.removeEventListener("mousemove", resize);
-			cm.display.wrapper.style.pointerEvents = '';
+		document.addEventListener('mousemove', resize);
+		document.addEventListener('mouseup', function resizeStop() {
+			document.removeEventListener('mouseup', resizeStop);
+			document.removeEventListener('mousemove', resize);
+			wrapper.style.pointerEvents = '';
 			document.body.style.cursor = '';
 		});
-	});
+	};
 
 	editors.splice(index || editors.length, 0, cm);
 	return cm;
@@ -874,6 +881,27 @@ function toggleStyle() {
 	save();
 }
 
+function toggleSectionHeight(cm) {
+	if (cm.state.toggleHeightSaved) {
+		// restore previous size
+		cm.setSize(null, cm.state.toggleHeightSaved);
+		cm.state.toggleHeightSaved = 0;
+	} else {
+		// maximize
+		const wrapper = cm.display.wrapper;
+		const allBounds = $('#sections').getBoundingClientRect();
+		const pageExtrasHeight = allBounds.top + window.scrollY +
+			parseFloat(getComputedStyle($('#sections')).paddingBottom);
+		const sectionExtrasHeight = cm.getSection().clientHeight - wrapper.offsetHeight;
+		cm.state.toggleHeightSaved = wrapper.clientHeight;
+		cm.setSize(null, window.innerHeight - sectionExtrasHeight - pageExtrasHeight);
+		const bounds = cm.getSection().getBoundingClientRect();
+		if (bounds.top < 0 || bounds.bottom > window.innerHeight) {
+			window.scrollBy(0, bounds.top);
+		}
+	}
+}
+
 function autocompleteOnTyping(cm, info, debounced) {
 	if (cm.state.completionActive
 	|| info.origin && !info.origin.includes('input')

From b4f2dffca0ff671a8e4c3be537db29b907ede158 Mon Sep 17 00:00:00 2001
From: narcolepticinsomniac <therealdoctorgonzo@gmail.com>
Date: Wed, 28 Jun 2017 06:25:26 -0400
Subject: [PATCH 50/94] Correct hovers for CodeMirror auto-suggestions

---
 edit.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/edit.html b/edit.html
index 2bfbd888..6ad70f2c 100644
--- a/edit.html
+++ b/edit.html
@@ -181,6 +181,10 @@
 				margin-left: 0.25rem;
 			}
 			/* code */
+			.CodeMirror-hint:hover {
+				color: white;
+				background: #08f;
+			}
 			.code {
 				height: 10rem;
 				width: 40rem;

From 160dd95b4cca1b74408e43edf286617acaec8208 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Thu, 29 Jun 2017 16:39:01 +0300
Subject: [PATCH 51/94] CodeMirror 5.27.4

---
 codemirror/addon/edit/matchbrackets.js  |  30 +-
 codemirror/addon/lint/lint.js           |   1 +
 codemirror/addon/search/search.js       |  10 +-
 codemirror/addon/search/searchcursor.js | 402 +++++++++++++++---------
 codemirror/keymap/emacs.js              |   2 +-
 codemirror/keymap/vim.js                |  91 ++++--
 codemirror/lib/codemirror.css           |   2 +-
 codemirror/mode/css/css.js              |  15 +-
 codemirror/theme/abcdef.css             |   2 +-
 codemirror/theme/ambiance.css           |   2 +-
 codemirror/theme/cobalt.css             |   2 +-
 codemirror/theme/colorforth.css         |   2 +-
 codemirror/theme/dracula.css            |   2 +-
 codemirror/theme/duotone-dark.css       |   2 +-
 codemirror/theme/duotone-light.css      |   2 +-
 codemirror/theme/eclipse.css            |   2 +-
 codemirror/theme/erlang-dark.css        |   2 +-
 codemirror/theme/icecoder.css           |   2 +-
 codemirror/theme/lesser-dark.css        |   2 +-
 codemirror/theme/liquibyte.css          |   6 +-
 codemirror/theme/material.css           |   4 +-
 codemirror/theme/mdn-like.css           |   2 +-
 codemirror/theme/monokai.css            |   2 +-
 codemirror/theme/night.css              |   2 +-
 codemirror/theme/panda-syntax.css       |   2 +-
 codemirror/theme/pastel-on-dark.css     |   2 +-
 codemirror/theme/rubyblue.css           |   2 +-
 codemirror/theme/seti.css               |   2 +-
 codemirror/theme/solarized.css          |   2 +-
 codemirror/theme/the-matrix.css         |   2 +-
 codemirror/theme/ttcn.css               |   2 +-
 codemirror/theme/twilight.css           |   2 +-
 codemirror/theme/vibrant-ink.css        |   2 +-
 codemirror/theme/xq-dark.css            |   2 +-
 codemirror/theme/xq-light.css           |   2 +-
 codemirror/theme/yeti.css               |   2 +-
 36 files changed, 384 insertions(+), 231 deletions(-)

diff --git a/codemirror/addon/edit/matchbrackets.js b/codemirror/addon/edit/matchbrackets.js
index 76754ed5..4d7a2308 100644
--- a/codemirror/addon/edit/matchbrackets.js
+++ b/codemirror/addon/edit/matchbrackets.js
@@ -16,12 +16,21 @@
 
   var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
 
-  function findMatchingBracket(cm, where, strict, config) {
+  function findMatchingBracket(cm, where, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
-    var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
+    var afterCursor = config && config.afterCursor
+    if (afterCursor == null)
+      afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
+
+    // A cursor is defined as between two characters, but in in vim command mode
+    // (i.e. not insert mode), the cursor is visually represented as a
+    // highlighted box on top of the 2nd character. Otherwise, we allow matches
+    // from before or after the cursor.
+    var match = (!afterCursor && pos >= 0 && matching[line.text.charAt(pos)]) ||
+        matching[line.text.charAt(++pos)];
     if (!match) return null;
     var dir = match.charAt(1) == ">" ? 1 : -1;
-    if (strict && (dir > 0) != (pos == where.ch)) return null;
+    if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
     var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
@@ -69,7 +78,7 @@
     var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
-      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
       if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
         marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
@@ -113,8 +122,17 @@
   });
 
   CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){
-    return findMatchingBracket(this, pos, strict, config);
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, config, oldConfig){
+    // Backwards-compatibility kludge
+    if (oldConfig || typeof config == "boolean") {
+      if (!oldConfig) {
+        config = config ? {strict: true} : null
+      } else {
+        oldConfig.strict = config
+        config = oldConfig
+      }
+    }
+    return findMatchingBracket(this, pos, config)
   });
   CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
     return scanForBracket(this, pos, dir, style, config);
diff --git a/codemirror/addon/lint/lint.js b/codemirror/addon/lint/lint.js
index e5ee7477..4e0c71fb 100644
--- a/codemirror/addon/lint/lint.js
+++ b/codemirror/addon/lint/lint.js
@@ -141,6 +141,7 @@
       lintAsync(cm, getAnnotations, passOptions)
     } else {
       var annotations = getAnnotations(cm.getValue(), passOptions, cm);
+      if (!annotations) return;
       if (annotations.then) annotations.then(function(issues) {
         updateLinting(cm, issues);
       });
diff --git a/codemirror/addon/search/search.js b/codemirror/addon/search/search.js
index 753b1afe..236e54cc 100644
--- a/codemirror/addon/search/search.js
+++ b/codemirror/addon/search/search.js
@@ -54,7 +54,7 @@
 
   function getSearchCursor(cm, query, pos) {
     // Heuristic: if the query string is all lowercase, do a case insensitive search.
-    return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
+    return cm.getSearchCursor(query, pos, {caseFold: queryCaseInsensitive(query), multiline: true});
   }
 
   function persistentDialog(cm, text, deflt, onEnter, onKeyDown) {
@@ -99,7 +99,7 @@
   }
 
   var queryDialog =
-    'Search: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+    '<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
 
   function startSearch(cm, state, query) {
     state.queryText = query;
@@ -188,8 +188,8 @@
 
   var replaceQueryDialog =
     ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
-  var replacementQueryDialog = 'With: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
-  var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>";
+  var replacementQueryDialog = '<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
+  var doReplaceConfirm = '<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';
 
   function replaceAll(cm, query, text) {
     cm.operation(function() {
@@ -205,7 +205,7 @@
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
     var query = cm.getSelection() || getSearchState(cm).lastQuery;
-    var dialogText = all ? "Replace all:" : "Replace:"
+    var dialogText = '<span class="CodeMirror-search-label">' + (all ? 'Replace all:' : 'Replace:') + '</span>';
     dialog(cm, dialogText + replaceQueryDialog, dialogText, query, function(query) {
       if (!query) return;
       query = parseQuery(query);
diff --git a/codemirror/addon/search/searchcursor.js b/codemirror/addon/search/searchcursor.js
index b70242ee..5feedd26 100644
--- a/codemirror/addon/search/searchcursor.js
+++ b/codemirror/addon/search/searchcursor.js
@@ -3,187 +3,285 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"))
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror"], mod)
   else // Plain browser env
-    mod(CodeMirror);
+    mod(CodeMirror)
 })(function(CodeMirror) {
-  "use strict";
-  var Pos = CodeMirror.Pos;
+  "use strict"
+  var Pos = CodeMirror.Pos
 
-  function SearchCursor(doc, query, pos, caseFold) {
-    this.atOccurrence = false; this.doc = doc;
-    if (caseFold == null && typeof query == "string") caseFold = false;
+  function regexpFlags(regexp) {
+    var flags = regexp.flags
+    return flags != null ? flags : (regexp.ignoreCase ? "i" : "")
+      + (regexp.global ? "g" : "")
+      + (regexp.multiline ? "m" : "")
+  }
 
-    pos = pos ? doc.clipPos(pos) : Pos(0, 0);
-    this.pos = {from: pos, to: pos};
+  function ensureGlobal(regexp) {
+    return regexp.global ? regexp : new RegExp(regexp.source, regexpFlags(regexp) + "g")
+  }
 
-    // The matches method is filled in based on the type of query.
-    // It takes a position and a direction, and returns an object
-    // describing the next occurrence of the query, or null if no
-    // more matches were found.
-    if (typeof query != "string") { // Regexp match
-      if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g");
-      this.matches = function(reverse, pos) {
-        if (reverse) {
-          query.lastIndex = 0;
-          var line = doc.getLine(pos.line).slice(0, pos.ch), cutOff = 0, match, start;
-          for (;;) {
-            query.lastIndex = cutOff;
-            var newMatch = query.exec(line);
-            if (!newMatch) break;
-            match = newMatch;
-            start = match.index;
-            cutOff = match.index + (match[0].length || 1);
-            if (cutOff == line.length) break;
-          }
-          var matchLen = (match && match[0].length) || 0;
-          if (!matchLen) {
-            if (start == 0 && line.length == 0) {match = undefined;}
-            else if (start != doc.getLine(pos.line).length) {
-              matchLen++;
-            }
-          }
-        } else {
-          query.lastIndex = pos.ch;
-          var line = doc.getLine(pos.line), match = query.exec(line);
-          var matchLen = (match && match[0].length) || 0;
-          var start = match && match.index;
-          if (start + matchLen != line.length && !matchLen) matchLen = 1;
-        }
-        if (match && matchLen)
-          return {from: Pos(pos.line, start),
-                  to: Pos(pos.line, start + matchLen),
-                  match: match};
-      };
-    } else { // String query
-      var origQuery = query;
-      if (caseFold) query = query.toLowerCase();
-      var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
-      var target = query.split("\n");
-      // Different methods for single-line and multi-line queries
-      if (target.length == 1) {
-        if (!query.length) {
-          // Empty string would match anything and never progress, so
-          // we define it to match nothing instead.
-          this.matches = function() {};
-        } else {
-          this.matches = function(reverse, pos) {
-            if (reverse) {
-              var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig);
-              var match = line.lastIndexOf(query);
-              if (match > -1) {
-                match = adjustPos(orig, line, match);
-                return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-              }
-             } else {
-               var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig);
-               var match = line.indexOf(query);
-               if (match > -1) {
-                 match = adjustPos(orig, line, match) + pos.ch;
-                 return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-               }
-            }
-          };
-        }
-      } else {
-        var origTarget = origQuery.split("\n");
-        this.matches = function(reverse, pos) {
-          var last = target.length - 1;
-          if (reverse) {
-            if (pos.line - (target.length - 1) < doc.firstLine()) return;
-            if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return;
-            var to = Pos(pos.line, origTarget[last].length);
-            for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            var line = doc.getLine(ln), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            return {from: Pos(ln, cut), to: to};
-          } else {
-            if (pos.line + (target.length - 1) > doc.lastLine()) return;
-            var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            var from = Pos(pos.line, cut);
-            for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
-            return {from: from, to: Pos(ln, origTarget[last].length)};
-          }
-        };
+  function maybeMultiline(regexp) {
+    return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source)
+  }
+
+  function searchRegexpForward(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
+      regexp.lastIndex = ch
+      var string = doc.getLine(line), match = regexp.exec(string)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpForwardMultiline(doc, regexp, start) {
+    if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start)
+
+    regexp = ensureGlobal(regexp)
+    var string, chunk = 1
+    for (var line = start.line, last = doc.lastLine(); line <= last;) {
+      // This grows the search buffer in exponentially-sized chunks
+      // between matches, so that nearby matches are fast and don't
+      // require concatenating the whole document (in case we're
+      // searching for something that has tons of matches), but at the
+      // same time, the amount of retries is limited.
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line++)
+        string = string == null ? curLine : string + "\n" + curLine
       }
+      chunk = chunk * 2
+      regexp.lastIndex = start.ch
+      var match = regexp.exec(string)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = start.line + before.length - 1, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  function lastMatchIn(string, regexp) {
+    var cutOff = 0, match
+    for (;;) {
+      regexp.lastIndex = cutOff
+      var newMatch = regexp.exec(string)
+      if (!newMatch) return match
+      match = newMatch
+      cutOff = match.index + (match[0].length || 1)
+      if (cutOff == string.length) return match
+    }
+  }
+
+  function searchRegexpBackward(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
+      var string = doc.getLine(line)
+      if (ch > -1) string = string.slice(0, ch)
+      var match = lastMatchIn(string, regexp)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpBackwardMultiline(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    var string, chunk = 1
+    for (var line = start.line, first = doc.firstLine(); line >= first;) {
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line--)
+        string = string == null ? curLine.slice(0, start.ch) : curLine + "\n" + string
+      }
+      chunk *= 2
+
+      var match = lastMatchIn(string, regexp)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = line + before.length, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  var doFold, noFold
+  if (String.prototype.normalize) {
+    doFold = function(str) { return str.normalize("NFD").toLowerCase() }
+    noFold = function(str) { return str.normalize("NFD") }
+  } else {
+    doFold = function(str) { return str.toLowerCase() }
+    noFold = function(str) { return str }
+  }
+
+  // Maps a position in a case-folded line back to a position in the original line
+  // (compensating for codepoints increasing in number during folding)
+  function adjustPos(orig, folded, pos, foldFunc) {
+    if (orig.length == folded.length) return pos
+    for (var pos1 = Math.min(pos, orig.length);;) {
+      var len1 = foldFunc(orig.slice(0, pos1)).length
+      if (len1 < pos) ++pos1
+      else if (len1 > pos) --pos1
+      else return pos1
+    }
+  }
+
+  function searchStringForward(doc, query, start, caseFold) {
+    // Empty string would match anything and never progress, so we
+    // define it to match nothing instead.
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) {
+      var orig = doc.getLine(line).slice(ch), string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.indexOf(lines[0])
+        if (found == -1) continue search
+        var start = adjustPos(orig, string, found, fold) + ch
+        return {from: Pos(line, adjustPos(orig, string, found, fold) + ch),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch)}
+      } else {
+        var cutFrom = string.length - lines[0].length
+        if (string.slice(cutFrom) != lines[0]) continue search
+        for (var i = 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(line + i)) != lines[i]) continue search
+        var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
+        if (end.slice(0, lastLine.length) != lastLine) continue search
+        return {from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch),
+                to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function searchStringBackward(doc, query, start, caseFold) {
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) {
+      var orig = doc.getLine(line)
+      if (ch > -1) orig = orig.slice(0, ch)
+      var string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.lastIndexOf(lines[0])
+        if (found == -1) continue search
+        return {from: Pos(line, adjustPos(orig, string, found, fold)),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold))}
+      } else {
+        var lastLine = lines[lines.length - 1]
+        if (string.slice(0, lastLine.length) != lastLine) continue search
+        for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(start + i)) != lines[i]) continue search
+        var top = doc.getLine(line + 1 - lines.length), topString = fold(top)
+        if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search
+        return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)),
+                to: Pos(line, adjustPos(orig, string, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function SearchCursor(doc, query, pos, options) {
+    this.atOccurrence = false
+    this.doc = doc
+    pos = pos ? doc.clipPos(pos) : Pos(0, 0)
+    this.pos = {from: pos, to: pos}
+
+    var caseFold
+    if (typeof options == "object") {
+      caseFold = options.caseFold
+    } else { // Backwards compat for when caseFold was the 4th argument
+      caseFold = options
+      options = null
+    }
+
+    if (typeof query == "string") {
+      if (caseFold == null) caseFold = false
+      this.matches = function(reverse, pos) {
+        return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold)
+      }
+    } else {
+      query = ensureGlobal(query)
+      if (!options || options.multiline !== false)
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos)
+        }
+      else
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
+        }
     }
   }
 
   SearchCursor.prototype = {
-    findNext: function() {return this.find(false);},
-    findPrevious: function() {return this.find(true);},
+    findNext: function() {return this.find(false)},
+    findPrevious: function() {return this.find(true)},
 
     find: function(reverse) {
-      var self = this, pos = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
-      function savePosAndFail(line) {
-        var pos = Pos(line, 0);
-        self.pos = {from: pos, to: pos};
-        self.atOccurrence = false;
-        return false;
+      var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
+
+      // Implements weird auto-growing behavior on null-matches for
+      // backwards-compatiblity with the vim code (unfortunately)
+      while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
+        if (reverse) {
+          if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
+          else if (result.from.line == this.doc.firstLine()) result = null
+          else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)))
+        } else {
+          if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1)
+          else if (result.to.line == this.doc.lastLine()) result = null
+          else result = this.matches(reverse, Pos(result.to.line + 1, 0))
+        }
       }
 
-      for (;;) {
-        if (this.pos = this.matches(reverse, pos)) {
-          this.atOccurrence = true;
-          return this.pos.match || true;
-        }
-        if (reverse) {
-          if (!pos.line) return savePosAndFail(0);
-          pos = Pos(pos.line-1, this.doc.getLine(pos.line-1).length);
-        }
-        else {
-          var maxLine = this.doc.lineCount();
-          if (pos.line == maxLine - 1) return savePosAndFail(maxLine);
-          pos = Pos(pos.line + 1, 0);
-        }
+      if (result) {
+        this.pos = result
+        this.atOccurrence = true
+        return this.pos.match || true
+      } else {
+        var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0)
+        this.pos = {from: end, to: end}
+        return this.atOccurrence = false
       }
     },
 
-    from: function() {if (this.atOccurrence) return this.pos.from;},
-    to: function() {if (this.atOccurrence) return this.pos.to;},
+    from: function() {if (this.atOccurrence) return this.pos.from},
+    to: function() {if (this.atOccurrence) return this.pos.to},
 
     replace: function(newText, origin) {
-      if (!this.atOccurrence) return;
-      var lines = CodeMirror.splitLines(newText);
-      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
+      if (!this.atOccurrence) return
+      var lines = CodeMirror.splitLines(newText)
+      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin)
       this.pos.to = Pos(this.pos.from.line + lines.length - 1,
-                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
-    }
-  };
-
-  // Maps a position in a case-folded line back to a position in the original line
-  // (compensating for codepoints increasing in number during folding)
-  function adjustPos(orig, folded, pos) {
-    if (orig.length == folded.length) return pos;
-    for (var pos1 = Math.min(pos, orig.length);;) {
-      var len1 = orig.slice(0, pos1).toLowerCase().length;
-      if (len1 < pos) ++pos1;
-      else if (len1 > pos) --pos1;
-      else return pos1;
+                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0))
     }
   }
 
   CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this.doc, query, pos, caseFold);
-  });
+    return new SearchCursor(this.doc, query, pos, caseFold)
+  })
   CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this, query, pos, caseFold);
-  });
+    return new SearchCursor(this, query, pos, caseFold)
+  })
 
   CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
-    var ranges = [];
-    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
+    var ranges = []
+    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold)
     while (cur.findNext()) {
-      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
-      ranges.push({anchor: cur.from(), head: cur.to()});
+      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break
+      ranges.push({anchor: cur.from(), head: cur.to()})
     }
     if (ranges.length)
-      this.setSelections(ranges, 0);
-  });
+      this.setSelections(ranges, 0)
+  })
 });
diff --git a/codemirror/keymap/emacs.js b/codemirror/keymap/emacs.js
index 2d5fe1b8..63da52fa 100644
--- a/codemirror/keymap/emacs.js
+++ b/codemirror/keymap/emacs.js
@@ -97,7 +97,7 @@
 
   function byExpr(cm, pos, dir) {
     var wrap;
-    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
+    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, {strict: true}))
         && wrap.match && (wrap.forward ? 1 : -1) == dir)
       return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
 
diff --git a/codemirror/keymap/vim.js b/codemirror/keymap/vim.js
index b2c404d4..d8a2d60d 100644
--- a/codemirror/keymap/vim.js
+++ b/codemirror/keymap/vim.js
@@ -259,7 +259,7 @@
         CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
 
       if (!next || next.attach != attachVimMap)
-        leaveVimMode(cm, false);
+        leaveVimMode(cm);
     }
     function attachVimMap(cm, prev) {
       if (this == CodeMirror.keyMap.vim)
@@ -411,11 +411,11 @@
       cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
-        throw Error('Unknown option: ' + name);
+        return new Error('Unknown option: ' + name);
       }
       if (option.type == 'boolean') {
         if (value && value !== true) {
-          throw Error('Invalid argument: ' + name + '=' + value);
+          return new Error('Invalid argument: ' + name + '=' + value);
         } else if (value !== false) {
           // Boolean options are set to true if value is not defined.
           value = true;
@@ -443,7 +443,7 @@
       cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
-        throw Error('Unknown option: ' + name);
+        return new Error('Unknown option: ' + name);
       }
       if (option.callback) {
         var local = cm && option.callback(undefined, cm);
@@ -649,9 +649,9 @@
         lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
         registerController: new RegisterController({}),
         // search history buffer
-        searchHistoryController: new HistoryController({}),
+        searchHistoryController: new HistoryController(),
         // ex Command history buffer
-        exCommandHistoryController : new HistoryController({})
+        exCommandHistoryController : new HistoryController()
       };
       for (var optionName in options) {
         var option = options[optionName];
@@ -958,7 +958,7 @@
      * for a reference implementation.
      */
     function defineRegister(name, register) {
-      var registers = vimGlobalState.registerController.registers[name];
+      var registers = vimGlobalState.registerController.registers;
       if (!name || name.length != 1) {
         throw Error('Register name must be 1 character');
       }
@@ -986,9 +986,6 @@
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise, blockwise) {
-        if (linewise && text.charAt(0) == '\n') {
-          text = text.slice(1) + '\n';
-        }
         if (linewise && text.charAt(text.length - 1) !== '\n'){
           text += '\n';
         }
@@ -1110,7 +1107,9 @@
           }
         }
         if (bestMatch.keys.slice(-11) == '<character>') {
-          inputState.selectedCharacter = lastChar(keys);
+          var character = lastChar(keys);
+          if (!character) return {type: 'none'};
+          inputState.selectedCharacter = character;
         }
         return {type: 'full', command: bestMatch};
       },
@@ -1836,16 +1835,16 @@
         var ch = cursor.ch;
         var lineText = cm.getLine(line);
         var symbol;
-        do {
-          symbol = lineText.charAt(ch++);
+        for (; ch < lineText.length; ch++) {
+          symbol = lineText.charAt(ch);
           if (symbol && isMatchableSymbol(symbol)) {
-            var style = cm.getTokenTypeAt(Pos(line, ch));
+            var style = cm.getTokenTypeAt(Pos(line, ch + 1));
             if (style !== "string" && style !== "comment") {
               break;
             }
           }
-        } while (symbol);
-        if (symbol) {
+        }
+        if (ch < lineText.length) {
           var matched = cm.findMatchingBracket(Pos(line, ch));
           return matched.to;
         } else {
@@ -2186,7 +2185,9 @@
       enterMacroRecordMode: function(cm, actionArgs) {
         var macroModeState = vimGlobalState.macroModeState;
         var registerName = actionArgs.selectedCharacter;
-        macroModeState.enterMacroRecordMode(cm, registerName);
+        if (vimGlobalState.registerController.isValidRegister(registerName)) {
+          macroModeState.enterMacroRecordMode(cm, registerName);
+        }
       },
       toggleOverwrite: function(cm) {
         if (!cm.state.overwrite) {
@@ -2704,7 +2705,7 @@
       }
     }
     function lastChar(keys) {
-      var match = /^.*(<[\w\-]+>)$/.exec(keys);
+      var match = /^.*(<[^>]+>)$/.exec(keys);
       var selectedCharacter = match ? match[1] : keys.slice(-1);
       if (selectedCharacter.length > 1){
         switch(selectedCharacter){
@@ -2715,6 +2716,7 @@
             selectedCharacter=' ';
             break;
           default:
+            selectedCharacter='';
             break;
         }
       }
@@ -2815,7 +2817,6 @@
         var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
         selections.push(range);
       }
-      primIndex = head.line == lastLine ? selections.length - 1 : 0;
       cm.setSelections(selections);
       selectionEnd.ch = headCh;
       base.ch = baseCh;
@@ -4083,23 +4084,42 @@
       parseLineSpec_: function(cm, inputStream) {
         var numberMatch = inputStream.match(/^(\d+)/);
         if (numberMatch) {
+          // Absolute line number plus offset (N+M or N-M) is probably a typo,
+          // not something the user actually wanted. (NB: vim does allow this.)
           return parseInt(numberMatch[1], 10) - 1;
         }
         switch (inputStream.next()) {
           case '.':
-            return cm.getCursor().line;
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
           case '$':
-            return cm.lastLine();
+            return this.parseLineSpecOffset_(inputStream, cm.lastLine());
           case '\'':
             var markName = inputStream.next();
             var markPos = getMarkPos(cm, cm.state.vim, markName);
             if (!markPos) throw new Error('Mark not set');
-            return markPos.line;
+            return this.parseLineSpecOffset_(inputStream, markPos.line);
+          case '-':
+          case '+':
+            inputStream.backUp(1);
+            // Offset is relative to current line if not otherwise specified.
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
           default:
             inputStream.backUp(1);
             return undefined;
         }
       },
+      parseLineSpecOffset_: function(inputStream, line) {
+        var offsetMatch = inputStream.match(/^([+-])?(\d+)/);
+        if (offsetMatch) {
+          var offset = parseInt(offsetMatch[2], 10);
+          if (offsetMatch[1] == "-") {
+            line -= offset;
+          } else {
+            line += offset;
+          }
+        }
+        return line;
+      },
       parseCommandArgs_: function(inputStream, params, command) {
         if (inputStream.eol()) {
           return;
@@ -4279,13 +4299,18 @@
         // If no value is provided, then we assume this is a get.
         if (!optionIsBoolean && value === undefined || forceGet) {
           var oldValue = getOption(optionName, cm, setCfg);
-          if (oldValue === true || oldValue === false) {
+          if (oldValue instanceof Error) {
+            showConfirm(cm, oldValue.message);
+          } else if (oldValue === true || oldValue === false) {
             showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
           } else {
             showConfirm(cm, '  ' + optionName + '=' + oldValue);
           }
         } else {
-          setOption(optionName, value, cm, setCfg);
+          var setOptionReturn = setOption(optionName, value, cm, setCfg);
+          if (setOptionReturn instanceof Error) {
+            showConfirm(cm, setOptionReturn.message);
+          }
         }
       },
       setlocal: function (cm, params) {
@@ -4484,6 +4509,10 @@
         if (tokens.length) {
           regexPart = tokens[0];
           replacePart = tokens[1];
+          if (regexPart && regexPart[regexPart.length - 1] === '$') {
+            regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
+            replacePart = replacePart ? replacePart + '\n' : '\n';
+          }
           if (replacePart !== undefined) {
             if (getOption('pcre')) {
               replacePart = unescapeRegexReplace(replacePart);
@@ -4903,7 +4932,7 @@
      * Listens for changes made in insert mode.
      * Should only be active in insert mode.
      */
-    function onChange(_cm, changeObj) {
+    function onChange(cm, changeObj) {
       var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       if (!macroModeState.isPlaying) {
@@ -4916,7 +4945,11 @@
               lastChange.changes = [];
               lastChange.maybeReset = false;
             }
-            lastChange.changes.push(text);
+            if (cm.state.overwrite && !/\n/.test(text)) {
+                lastChange.changes.push([text]);
+            } else {
+                lastChange.changes.push(text);
+            }
           }
           // Change objects may be chained with next.
           changeObj = changeObj.next;
@@ -5098,9 +5131,13 @@
           var change = changes[j];
           if (change instanceof InsertModeKey) {
             CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
-          } else {
+          } else if (typeof change == "string") {
             var cur = cm.getCursor();
             cm.replaceRange(change, cur, cur);
+          } else {
+            var start = cm.getCursor();
+            var end = offsetCursor(start, 0, change[0].length);
+            cm.replaceRange(change[0], start, end);
           }
         }
       }
diff --git a/codemirror/lib/codemirror.css b/codemirror/lib/codemirror.css
index b962b383..b008351a 100644
--- a/codemirror/lib/codemirror.css
+++ b/codemirror/lib/codemirror.css
@@ -119,7 +119,7 @@
 .cm-s-default .cm-property,
 .cm-s-default .cm-operator {}
 .cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
 .cm-s-default .cm-comment {color: #a50;}
 .cm-s-default .cm-string {color: #a11;}
 .cm-s-default .cm-string-2 {color: #f50;}
diff --git a/codemirror/mode/css/css.js b/codemirror/mode/css/css.js
index 02cc93d9..056c48e6 100644
--- a/codemirror/mode/css/css.js
+++ b/codemirror/mode/css/css.js
@@ -401,7 +401,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
             ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
           // Dedent relative to current context.
           indent = Math.max(0, cx.indent - indentUnit);
-          cx = cx.prev;
         }
       }
       return indent;
@@ -472,7 +471,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "border-top-left-radius", "border-top-right-radius", "border-top-style",
     "border-top-width", "border-width", "bottom", "box-decoration-break",
     "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
-    "caption-side", "clear", "clip", "color", "color-profile", "column-count",
+    "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
     "column-fill", "column-gap", "column-rule", "column-rule-color",
     "column-rule-style", "column-rule-width", "column-span", "column-width",
     "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
@@ -493,7 +492,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
     "grid-template-rows", "hanging-punctuation", "height", "hyphens",
     "icon", "image-orientation", "image-rendering", "image-resolution",
-    "inline-box-align", "justify-content", "left", "letter-spacing",
+    "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
     "line-break", "line-height", "line-stacking", "line-stacking-ruby",
     "line-stacking-shift", "line-stacking-strategy", "list-style",
     "list-style-image", "list-style-position", "list-style-type", "margin",
@@ -508,7 +507,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
     "page", "page-break-after", "page-break-before", "page-break-inside",
     "page-policy", "pause", "pause-after", "pause-before", "perspective",
-    "perspective-origin", "pitch", "pitch-range", "play-during", "position",
+    "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
     "presentation-level", "punctuation-trim", "quotes", "region-break-after",
     "region-break-before", "region-break-inside", "region-fragment",
     "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
@@ -659,13 +658,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
     "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
-    "searchfield-results-button", "searchfield-results-decoration",
+    "searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",
     "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
     "simp-chinese-formal", "simp-chinese-informal", "single",
     "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
     "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
+    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
     "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
@@ -748,8 +747,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
       },
       ":": function(stream) {
-        if (stream.match(/\s*\{/))
-          return [null, "{"];
+        if (stream.match(/\s*\{/, false))
+          return [null, null]
         return false;
       },
       "$": function(stream) {
diff --git a/codemirror/theme/abcdef.css b/codemirror/theme/abcdef.css
index 7f9d7887..cf935309 100644
--- a/codemirror/theme/abcdef.css
+++ b/codemirror/theme/abcdef.css
@@ -14,7 +14,7 @@
 .cm-s-abcdef span.cm-def { color: #fffabc; }
 .cm-s-abcdef span.cm-variable { color: #abcdef; }
 .cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
-.cm-s-abcdef span.cm-variable-3 { color: #def; }
+.cm-s-abcdef span.cm-variable-3, .cm-s-abcdef span.cm-type { color: #def; }
 .cm-s-abcdef span.cm-property { color: #fedcba; }
 .cm-s-abcdef span.cm-operator { color: #ff0; }
 .cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
diff --git a/codemirror/theme/ambiance.css b/codemirror/theme/ambiance.css
index bce34464..782fca43 100644
--- a/codemirror/theme/ambiance.css
+++ b/codemirror/theme/ambiance.css
@@ -11,7 +11,7 @@
 .cm-s-ambiance .cm-def { color: #aac6e3; }
 .cm-s-ambiance .cm-variable { color: #ffb795; }
 .cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
-.cm-s-ambiance .cm-variable-3 { color: #faded3; }
+.cm-s-ambiance .cm-variable-3, .cm-s-ambiance .cm-type { color: #faded3; }
 .cm-s-ambiance .cm-property { color: #eed1b3; }
 .cm-s-ambiance .cm-operator { color: #fa8d6a; }
 .cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
diff --git a/codemirror/theme/cobalt.css b/codemirror/theme/cobalt.css
index d88223ed..bbbda3b5 100644
--- a/codemirror/theme/cobalt.css
+++ b/codemirror/theme/cobalt.css
@@ -15,7 +15,7 @@
 .cm-s-cobalt span.cm-string { color: #3ad900; }
 .cm-s-cobalt span.cm-meta { color: #ff9d00; }
 .cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
-.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def, .cm-s-cobalt .cm-type { color: white; }
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
 .cm-s-cobalt span.cm-link { color: #845dc4; }
diff --git a/codemirror/theme/colorforth.css b/codemirror/theme/colorforth.css
index 606899f3..19095e41 100644
--- a/codemirror/theme/colorforth.css
+++ b/codemirror/theme/colorforth.css
@@ -15,7 +15,7 @@
 .cm-s-colorforth span.cm-atom        { color: #606060; }
 
 .cm-s-colorforth span.cm-variable-2  { color: #EEE; }
-.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
+.cm-s-colorforth span.cm-variable-3, .cm-s-colorforth span.cm-type { color: #DDD; }
 .cm-s-colorforth span.cm-property    {}
 .cm-s-colorforth span.cm-operator    {}
 
diff --git a/codemirror/theme/dracula.css b/codemirror/theme/dracula.css
index 53a660b5..253133ef 100644
--- a/codemirror/theme/dracula.css
+++ b/codemirror/theme/dracula.css
@@ -34,7 +34,7 @@
 .cm-s-dracula span.cm-qualifier { color: #50fa7b; }
 .cm-s-dracula span.cm-property { color: #66d9ef; }
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3 { color: #ffb86c; }
+.cm-s-dracula span.cm-variable-3, .cm-s-dracula span.cm-type { color: #ffb86c; }
 
 .cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
 .cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/codemirror/theme/duotone-dark.css b/codemirror/theme/duotone-dark.css
index b09a585c..88fdc76c 100644
--- a/codemirror/theme/duotone-dark.css
+++ b/codemirror/theme/duotone-dark.css
@@ -24,7 +24,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 .cm-s-duotone-dark span.cm-operator { color: #ffad5c; }
 .cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
 
-.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
+.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
 .cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
 .cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
 
diff --git a/codemirror/theme/duotone-light.css b/codemirror/theme/duotone-light.css
index 80203d15..d99480f7 100644
--- a/codemirror/theme/duotone-light.css
+++ b/codemirror/theme/duotone-light.css
@@ -23,7 +23,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 .cm-s-duotone-light span.cm-string, .cm-s-duotone-light span.cm-operator { color: #1659df; }
 .cm-s-duotone-light span.cm-positive { color: #896724; }
 
-.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
+.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
 .cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
 .cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
 
diff --git a/codemirror/theme/eclipse.css b/codemirror/theme/eclipse.css
index 1bde460e..800d603f 100644
--- a/codemirror/theme/eclipse.css
+++ b/codemirror/theme/eclipse.css
@@ -5,7 +5,7 @@
 .cm-s-eclipse span.cm-def { color: #00f; }
 .cm-s-eclipse span.cm-variable { color: black; }
 .cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
-.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3, .cm-s-eclipse span.cm-type { color: #0000C0; }
 .cm-s-eclipse span.cm-property { color: black; }
 .cm-s-eclipse span.cm-operator { color: black; }
 .cm-s-eclipse span.cm-comment { color: #3F7F5F; }
diff --git a/codemirror/theme/erlang-dark.css b/codemirror/theme/erlang-dark.css
index 65fe4814..8c8a4171 100644
--- a/codemirror/theme/erlang-dark.css
+++ b/codemirror/theme/erlang-dark.css
@@ -27,7 +27,7 @@
 .cm-s-erlang-dark span.cm-tag        { color: #9effff; }
 .cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
 .cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
-.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
+.cm-s-erlang-dark span.cm-variable-3, .cm-s-erlang-dark span.cm-type { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
 .cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
diff --git a/codemirror/theme/icecoder.css b/codemirror/theme/icecoder.css
index ffebaf2f..5440fbe2 100644
--- a/codemirror/theme/icecoder.css
+++ b/codemirror/theme/icecoder.css
@@ -11,7 +11,7 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 
 .cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
 .cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
-.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
+.cm-s-icecoder span.cm-variable-3, .cm-s-icecoder span.cm-type { color: #f9602c; } /* orange */
 
 .cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
 .cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
diff --git a/codemirror/theme/lesser-dark.css b/codemirror/theme/lesser-dark.css
index 690c183d..b2ec418f 100644
--- a/codemirror/theme/lesser-dark.css
+++ b/codemirror/theme/lesser-dark.css
@@ -27,7 +27,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-def { color: white; }
 .cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
 .cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
+.cm-s-lesser-dark span.cm-variable-3, .cm-s-lesser-dark span.cm-type { color: white; }
 .cm-s-lesser-dark span.cm-property { color: #92A75C; }
 .cm-s-lesser-dark span.cm-operator { color: #92A75C; }
 .cm-s-lesser-dark span.cm-comment { color: #666; }
diff --git a/codemirror/theme/liquibyte.css b/codemirror/theme/liquibyte.css
index 9db8bde7..393825e0 100644
--- a/codemirror/theme/liquibyte.css
+++ b/codemirror/theme/liquibyte.css
@@ -36,7 +36,7 @@
 .cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
 
 .cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable-3  { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable-3, .cm-s-liquibyte span.cm-type { color: #c080ff; font-weight: bold; }
 .cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
 .cm-s-liquibyte span.cm-operator    { color: #fff; }
 
@@ -59,10 +59,10 @@
 .CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
 /* Scrollbars */
 /* Simple */
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div:hover {
 	background-color: rgba(80, 80, 80, .7);
 }
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
 	background-color: rgba(80, 80, 80, .3);
 	border: 1px solid #404040;
 	border-radius: 5px;
diff --git a/codemirror/theme/material.css b/codemirror/theme/material.css
index 01d86793..84962a24 100644
--- a/codemirror/theme/material.css
+++ b/codemirror/theme/material.css
@@ -27,7 +27,7 @@
 .cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
 .cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
 .cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3 { color: #82B1FF; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #82B1FF; }
 .cm-s-material .cm-builtin { color: #DECB6B; }
 .cm-s-material .cm-atom { color: #F77669; }
 .cm-s-material .cm-number { color: #F77669; }
@@ -41,7 +41,7 @@
 .cm-s-material .cm-attribute { color: #FFCB6B; }
 .cm-s-material .cm-property { color: #80CBAE; }
 .cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3 { color: #DECB6B; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #DECB6B; }
 .cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
 .cm-s-material .cm-error {
   color: rgba(255, 255, 255, 1.0);
diff --git a/codemirror/theme/mdn-like.css b/codemirror/theme/mdn-like.css
index f325d450..622ed3ef 100644
--- a/codemirror/theme/mdn-like.css
+++ b/codemirror/theme/mdn-like.css
@@ -21,7 +21,7 @@
 .cm-s-mdn-like .cm-number { color:  #ca7841; }
 .cm-s-mdn-like .cm-def { color: #8DA6CE; }
 .cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
-.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; }
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def, .cm-s-mdn-like span.cm-type { color: #07a; }
 
 .cm-s-mdn-like .cm-variable { color: #07a; }
 .cm-s-mdn-like .cm-property { color: #905; }
diff --git a/codemirror/theme/monokai.css b/codemirror/theme/monokai.css
index 7c8a4c5d..b5edd13f 100644
--- a/codemirror/theme/monokai.css
+++ b/codemirror/theme/monokai.css
@@ -21,7 +21,7 @@
 
 .cm-s-monokai span.cm-variable { color: #f8f8f2; }
 .cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
+.cm-s-monokai span.cm-variable-3, .cm-s-monokai span.cm-type { color: #66d9ef; }
 .cm-s-monokai span.cm-def { color: #fd971f; }
 .cm-s-monokai span.cm-bracket { color: #f8f8f2; }
 .cm-s-monokai span.cm-tag { color: #f92672; }
diff --git a/codemirror/theme/night.css b/codemirror/theme/night.css
index fd4e5619..f631bf42 100644
--- a/codemirror/theme/night.css
+++ b/codemirror/theme/night.css
@@ -17,7 +17,7 @@
 .cm-s-night span.cm-string { color: #37f14a; }
 .cm-s-night span.cm-meta { color: #7678e2; }
 .cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
-.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
+.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def, .cm-s-night span.cm-type { color: white; }
 .cm-s-night span.cm-bracket { color: #8da6ce; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
 .cm-s-night span.cm-link { color: #845dc4; }
diff --git a/codemirror/theme/panda-syntax.css b/codemirror/theme/panda-syntax.css
index c93b2ea0..6de58b56 100644
--- a/codemirror/theme/panda-syntax.css
+++ b/codemirror/theme/panda-syntax.css
@@ -52,7 +52,7 @@
 .cm-s-panda-syntax .cm-variable-2 {
 	color: #ff9ac1;
 }
-.cm-s-panda-syntax .cm-variable-3 {
+.cm-s-panda-syntax .cm-variable-3, .cm-s-panda-syntax .cm-type {
 	color: #ff9ac1;
 }
 
diff --git a/codemirror/theme/pastel-on-dark.css b/codemirror/theme/pastel-on-dark.css
index 2603d362..60435dd1 100644
--- a/codemirror/theme/pastel-on-dark.css
+++ b/codemirror/theme/pastel-on-dark.css
@@ -34,7 +34,7 @@
 .cm-s-pastel-on-dark span.cm-string { color: #66A968; }
 .cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
 .cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
-.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-variable-3, .cm-s-pastel-on-dark span.cm-type { color: #DE8E30; }
 .cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
 .cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
 .cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
diff --git a/codemirror/theme/rubyblue.css b/codemirror/theme/rubyblue.css
index 76d33e77..1f181b06 100644
--- a/codemirror/theme/rubyblue.css
+++ b/codemirror/theme/rubyblue.css
@@ -15,7 +15,7 @@
 .cm-s-rubyblue span.cm-string { color: #F08047; }
 .cm-s-rubyblue span.cm-meta { color: #F0F; }
 .cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
-.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
+.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def, .cm-s-rubyblue span.cm-type { color: white; }
 .cm-s-rubyblue span.cm-bracket { color: #F0F; }
 .cm-s-rubyblue span.cm-link { color: #F4C20B; }
 .cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
diff --git a/codemirror/theme/seti.css b/codemirror/theme/seti.css
index 6632d3fc..814f76f7 100644
--- a/codemirror/theme/seti.css
+++ b/codemirror/theme/seti.css
@@ -38,7 +38,7 @@
 .cm-s-seti span.cm-attribute { color: #9fca56; }
 .cm-s-seti span.cm-qualifier { color: #9fca56; }
 .cm-s-seti span.cm-property { color: #a074c4; }
-.cm-s-seti span.cm-variable-3 { color: #9fca56; }
+.cm-s-seti span.cm-variable-3, .cm-s-seti span.cm-type { color: #9fca56; }
 .cm-s-seti span.cm-builtin { color: #9fca56; }
 .cm-s-seti .CodeMirror-activeline-background { background: #101213; }
 .cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/codemirror/theme/solarized.css b/codemirror/theme/solarized.css
index 1f39c7ed..d95f6c1b 100644
--- a/codemirror/theme/solarized.css
+++ b/codemirror/theme/solarized.css
@@ -57,7 +57,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 .cm-s-solarized .cm-variable { color: #839496; }
 .cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
+.cm-s-solarized .cm-variable-3, .cm-s-solarized .cm-type { color: #6c71c4; }
 
 .cm-s-solarized .cm-property { color: #2aa198; }
 .cm-s-solarized .cm-operator { color: #6c71c4; }
diff --git a/codemirror/theme/the-matrix.css b/codemirror/theme/the-matrix.css
index 3912a8db..c4c93c11 100644
--- a/codemirror/theme/the-matrix.css
+++ b/codemirror/theme/the-matrix.css
@@ -14,7 +14,7 @@
 .cm-s-the-matrix span.cm-def { color: #99C; }
 .cm-s-the-matrix span.cm-variable { color: #F6C; }
 .cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
-.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
+.cm-s-the-matrix span.cm-variable-3, .cm-s-the-matrix span.cm-type { color: #96F; }
 .cm-s-the-matrix span.cm-property { color: #62FFA0; }
 .cm-s-the-matrix span.cm-operator { color: #999; }
 .cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
diff --git a/codemirror/theme/ttcn.css b/codemirror/theme/ttcn.css
index b3d46564..0b14ac35 100644
--- a/codemirror/theme/ttcn.css
+++ b/codemirror/theme/ttcn.css
@@ -29,7 +29,7 @@
 .cm-s-ttcn .cm-tag { color: #170; }
 .cm-s-ttcn .cm-variable { color: #8B2252; }
 .cm-s-ttcn .cm-variable-2 { color: #05a; }
-.cm-s-ttcn .cm-variable-3 { color: #085; }
+.cm-s-ttcn .cm-variable-3, .cm-s-ttcn .cm-type { color: #085; }
 
 .cm-s-ttcn .cm-invalidchar { color: #f00; }
 
diff --git a/codemirror/theme/twilight.css b/codemirror/theme/twilight.css
index d342b899..b2b1b2aa 100644
--- a/codemirror/theme/twilight.css
+++ b/codemirror/theme/twilight.css
@@ -14,7 +14,7 @@
 .cm-s-twilight .cm-number { color:  #ca7841; } /**/
 .cm-s-twilight .cm-def { color: #8DA6CE; }
 .cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def, .cm-s-twilight span.cm-type { color: #607392; } /**/
 .cm-s-twilight .cm-operator { color: #cda869; } /**/
 .cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
 .cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
diff --git a/codemirror/theme/vibrant-ink.css b/codemirror/theme/vibrant-ink.css
index ac4ec6d8..b13ecf21 100644
--- a/codemirror/theme/vibrant-ink.css
+++ b/codemirror/theme/vibrant-ink.css
@@ -16,7 +16,7 @@
 .cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
 .cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
 .cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def, .cm-s-vibrant span.cm-type { color: #FFC66D; }
 .cm-s-vibrant-ink .cm-operator { color: #888; }
 .cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
 .cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
diff --git a/codemirror/theme/xq-dark.css b/codemirror/theme/xq-dark.css
index e3bd960b..7da1a0f7 100644
--- a/codemirror/theme/xq-dark.css
+++ b/codemirror/theme/xq-dark.css
@@ -36,7 +36,7 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
 .cm-s-xq-dark span.cm-variable { color: #FFF; }
 .cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
-.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
+.cm-s-xq-dark span.cm-variable-3, .cm-s-xq-dark span.cm-type { color: #DDD; }
 .cm-s-xq-dark span.cm-property {}
 .cm-s-xq-dark span.cm-operator {}
 .cm-s-xq-dark span.cm-comment { color: gray; }
diff --git a/codemirror/theme/xq-light.css b/codemirror/theme/xq-light.css
index 8d2fcb66..7b182ea9 100644
--- a/codemirror/theme/xq-light.css
+++ b/codemirror/theme/xq-light.css
@@ -26,7 +26,7 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-def { text-decoration:underline; }
 .cm-s-xq-light span.cm-variable { color: black; }
 .cm-s-xq-light span.cm-variable-2 { color:black; }
-.cm-s-xq-light span.cm-variable-3 { color: black; }
+.cm-s-xq-light span.cm-variable-3, .cm-s-xq-light span.cm-type { color: black; }
 .cm-s-xq-light span.cm-property {}
 .cm-s-xq-light span.cm-operator {}
 .cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
diff --git a/codemirror/theme/yeti.css b/codemirror/theme/yeti.css
index c70d4d21..d085f724 100644
--- a/codemirror/theme/yeti.css
+++ b/codemirror/theme/yeti.css
@@ -39,6 +39,6 @@
 .cm-s-yeti span.cm-qualifier { color: #96c0d8; }
 .cm-s-yeti span.cm-property { color: #a074c4; }
 .cm-s-yeti span.cm-builtin { color: #a074c4; }
-.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
+.cm-s-yeti span.cm-variable-3, .cm-s-yeti span.cm-type { color: #96c0d8; }
 .cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
 .cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }

From 67c6bd16bace107538fdd4f97378fa2242eb9113 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Thu, 29 Jun 2017 16:47:13 +0300
Subject: [PATCH 52/94] spellcheck="false" in text input fields

---
 edit.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/edit.html b/edit.html
index 6ad70f2c..775c5a08 100644
--- a/edit.html
+++ b/edit.html
@@ -654,22 +654,22 @@
 			</div>
 		</template>
 		<template data-id="find">
-			<span i18n-text="search">: <input type="text" class="CodeMirror-search-field">
+			<span i18n-text="search">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
 				<span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
 			</span>
 		</template>
 		<template data-id="replace">
-			<span i18n-text="replace">: <input type="text" class="CodeMirror-search-field">
+			<span i18n-text="replace">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
 				<span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
 			</span>
 		</template>
 		<template data-id="replaceAll">
-			<span i18n-text="replaceAll">: <input type="text" class="CodeMirror-search-field">
+			<span i18n-text="replaceAll">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
 				<span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
 			</span>
 		</template>
 		<template data-id="replaceWith">
-			<span i18n-text="replaceWith">: <input type="text" class="CodeMirror-search-field">
+			<span i18n-text="replaceWith">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
 			</span>
 		</template>
 		<template data-id="replaceConfirm">
@@ -695,7 +695,7 @@
 			<h1 id="heading">&nbsp;</h1> <!-- nbsp allocates the actual height which prevents page shift -->
 			<section id="basic-info">
 				<div id="basic-info-name">
-					<input id="name" class="style-contributor" i18n-placeholder="styleMissingName">
+					<input id="name" class="style-contributor" i18n-placeholder="styleMissingName" spellcheck="false">
 					<a id="url" target="_blank"><svg class="svg-icon"><use xlink:href="#svg-icon-external-link"/></svg></a>
 				</div>
 				<div id="basic-info-enabled">

From d02ca476a7f035df1a9e23dbd7f15fcbf3575ac0 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Thu, 29 Jun 2017 16:51:18 +0300
Subject: [PATCH 53/94] spellcheck="false" in text input fields 2

---
 manage.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manage.html b/manage.html
index d23e8985..5fc34411 100644
--- a/manage.html
+++ b/manage.html
@@ -152,7 +152,7 @@
              data-filter-hide=":not(.updatable):not(.update-done), .no-update:not(.update-problem)">
       <span i18n-text="manageOnlyUpdates"></span>
     </label>
-    <input id="search" type="search" i18n-placeholder="searchStyles"
+    <input id="search" type="search" i18n-placeholder="searchStyles" spellcheck="false"
            data-filter=":not(.not-matching)"
            data-filter-hide=".not-matching">
   </fieldset>

From b45f51f1366043fe451cd282116aa83b1525fd5c Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 1 Jul 2017 13:37:35 +0300
Subject: [PATCH 54/94] editor: CM scroller height fix for resize-grip

---
 edit.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/edit.html b/edit.html
index 775c5a08..2ec63cc2 100644
--- a/edit.html
+++ b/edit.html
@@ -192,6 +192,14 @@
 			.CodeMirror {
 				border: solid #CCC 1px;
 			}
+			.CodeMirror-scroll {
+				height: auto;
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 6px; /* resize-grip height */
+			}
 			.CodeMirror-lint-mark-warning {
 				background: none;
 			}

From c3218680f16f54e47fc4666f778a52eedba47ddc Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 28 Jun 2017 13:01:00 +0300
Subject: [PATCH 55/94] optionsUI: vertically align options

---
 options/index.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/options/index.css b/options/index.css
index 8262040b..a08485a9 100644
--- a/options/index.css
+++ b/options/index.css
@@ -67,10 +67,7 @@ h1 {
 label {
   display: flex;
   margin: .25ex 0;
-}
-
-label > * {
-  /*vertical-align: middle;*/
+  align-items: center;
 }
 
 label > :first-child {

From ece3822891424f4f50370f01863062dab1e226a0 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 28 Jun 2017 13:49:04 +0300
Subject: [PATCH 56/94] option to switch toolbar icon sets

---
 .eslintrc                 |   2 +-
 _locales/en/messages.json |   9 +++++++++
 background.js             |  10 ++++++----
 dom.js                    |   9 +++++----
 images/icon/16.png        | Bin 294 -> 617 bytes
 images/icon/16w.png       | Bin 296 -> 676 bytes
 images/icon/16x.png       | Bin 262 -> 583 bytes
 images/icon/32.png        | Bin 744 -> 1241 bytes
 images/icon/32w.png       | Bin 781 -> 1231 bytes
 images/icon/32x.png       | Bin 752 -> 1108 bytes
 images/icon/38.png        | Bin 854 -> 1631 bytes
 images/icon/38w.png       | Bin 891 -> 1746 bytes
 images/icon/38x.png       | Bin 845 -> 1625 bytes
 images/icon/light/16.png  | Bin 0 -> 654 bytes
 images/icon/light/16w.png | Bin 0 -> 671 bytes
 images/icon/light/16x.png | Bin 0 -> 358 bytes
 images/icon/light/19.png  | Bin 0 -> 654 bytes
 images/icon/light/19w.png | Bin 0 -> 671 bytes
 images/icon/light/19x.png | Bin 0 -> 358 bytes
 images/icon/light/32.png  | Bin 0 -> 1217 bytes
 images/icon/light/32w.png | Bin 0 -> 1216 bytes
 images/icon/light/32x.png | Bin 0 -> 1222 bytes
 images/icon/light/38.png  | Bin 0 -> 1694 bytes
 images/icon/light/38w.png | Bin 0 -> 1772 bytes
 images/icon/light/38x.png | Bin 0 -> 1680 bytes
 options/index.css         |   8 ++++++++
 options/index.html        |  24 ++++++++++++++++++++++++
 options/index.js          |  24 ++++++++++++++++++++++++
 prefs.js                  |   4 ++++
 29 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 images/icon/light/16.png
 create mode 100644 images/icon/light/16w.png
 create mode 100644 images/icon/light/16x.png
 create mode 100644 images/icon/light/19.png
 create mode 100644 images/icon/light/19w.png
 create mode 100644 images/icon/light/19x.png
 create mode 100644 images/icon/light/32.png
 create mode 100644 images/icon/light/32w.png
 create mode 100644 images/icon/light/32x.png
 create mode 100644 images/icon/light/38.png
 create mode 100644 images/icon/light/38w.png
 create mode 100644 images/icon/light/38x.png

diff --git a/.eslintrc b/.eslintrc
index af049f37..6441aad4 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -215,7 +215,7 @@ rules:
   no-unreachable: [2]
   no-unsafe-finally: [2]
   no-unsafe-negation: [2]
-  no-unused-expressions: [2]
+  no-unused-expressions: [1]
   no-unused-labels: [0]
   no-unused-vars: [1, {args: after-used, vars: local, argsIgnorePattern: ^_}]
   no-use-before-define: [2, nofunc]
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index c6a336cf..4fe186cf 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -681,6 +681,15 @@
   "optionsUpdateImportNote": {
     "message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated."
   },
+  "optionsCustomizeIcon": {
+    "message": "Toolbar icon"
+  },
+  "optionsIconLight": {
+    "message": "Light browser themes"
+  },
+  "optionsIconDark": {
+    "message": "Dark browser themes"
+  },
   "optionsCustomizeBadge": {
     "message": "Badge on the toolbar icon"
   },
diff --git a/background.js b/background.js
index ea7db689..7b9daa43 100644
--- a/background.js
+++ b/background.js
@@ -258,15 +258,17 @@ function updateIcon(tab, styles) {
     const postfix = disableAll ? 'x' : numStyles == 0 ? 'w' : '';
     const color = prefs.get(disableAll ? 'badgeDisabled' : 'badgeNormal');
     const text = prefs.get('show-badge') && numStyles ? String(numStyles) : '';
+    const iconset = ['', 'light/'][prefs.get('iconset')] || '';
+    const path = 'images/icon/' + iconset;
     chrome.browserAction.setIcon({
       tabId: tab.id,
       path: {
         // Material Design 2016 new size is 16px
-        16: `images/icon/16${postfix}.png`,
-        32: `images/icon/32${postfix}.png`,
+        16: `${path}16${postfix}.png`,
+        32: `${path}32${postfix}.png`,
         // Chromium forks or non-chromium browsers may still use the traditional 19px
-        19: `images/icon/19${postfix}.png`,
-        38: `images/icon/38${postfix}.png`,
+        19: `${path}19${postfix}.png`,
+        38: `${path}38${postfix}.png`,
         // TODO: add Edge preferred sizes: 20, 25, 30, 40
       },
     }, () => {
diff --git a/dom.js b/dom.js
index 139619cc..be081107 100644
--- a/dom.js
+++ b/dom.js
@@ -12,16 +12,17 @@ for (const type of [NodeList, NamedNodeMap, HTMLCollection, HTMLAllCollection])
 }
 
 // add favicon in Firefox
-if (/Firefox/.test(navigator.userAgent)) {
-  for (const size of [128, 38, 32, 19, 16]) {
+navigator.userAgent.includes('Firefox') && setTimeout(() => {
+  const iconset = ['', 'light/'][prefs.get('iconset')] || '';
+  for (const size of [38, 32, 19, 16]) {
     document.head.appendChild($element({
       tag: 'link',
       rel: 'icon',
-      href: `/images/icon/${size}.png`,
+      href: `/images/icon/${iconset}${size}.png`,
       sizes: size + 'x' + size,
     }));
   }
-}
+});
 
 
 function onDOMready() {
diff --git a/images/icon/16.png b/images/icon/16.png
index fa6c32b32cb5d195e12dd25c9df02ea4d082a520..48252ae4ef41957af6cbd55894c5cd3cc2735b2f 100644
GIT binary patch
delta 592
zcmV-W0<Zn10_g;hB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Rc1_~Af5-|>n3IG5B_DMuRR5;6xlgn#UQ4q#|_oQh}ZXS@dC5zfdrFCOn
z2o-#Tx)J;fV&enT5?uILh#TFAAnt^^s1K;5f)o@til~bsl7EH@t%8V(8zrR;+Qi&E
z8*Xy0i-b#KVw2e%m^1Uu$M?-BgXtu~?Ft~}Btkf8Cn{3IB0^HjJW&SINfcGplK1aA
zl2Z>vJN@3!INsA|Ge)uKR%#54Z@YJy1)cqVyrFT_y?d~@+yIml34Tr7Ci~_!0NdX$
zBDIXt@h`fyZ+|lb52q0hwJzV`^MPn2*Z|-;F={ri+_+Bu-CH`hY{j-?Cxy9KYXECs
zKLCcVlb@ZXlGP~wS)jPM&{U5GPHUe(0ial|_#e;U2?P-~`+o%$!tF9v?@gMC)O3Wx
z#}8F{y}k5Yyu`K_ukehXs%!jxX9D4N8KUN^`62T;;(y^W61Q%m$Cs*894bBMFVG!6
zXVxheOZ9DL<N9zOJC5)26@)`Y7K(g7d;p|0ZEU$X*_Y4B%|)wB>^3Z_vxSX;Ae)AV
z$<NOti+Q>R{5TID0-*Hs2bHY0F@SyFe$<f>oJWq<<&CuxE7z{J-h<Sm2<7Evx`u|T
z`sQ+!zDa%|{p>0FQoK2UQLbb>C(pQ2ktqtXD1}&bLtVPZ!x*}*t#=_<J7;@a=PYFw
eA;zSZnfVL;@w$4abb!kM0000<MNUMnLSTX=OcRCx

delta 267
zcmV+m0rdXq1f~LzB!BHmL_t(|+GAh<0+si#8&p5M{Z9%8>0y8YkN|_X<9`MtZQ?Lc
zEm#jO12ifs{%f2)`(NYNF9d$}?7zm8DTEEsC@VwNh>VFcV9y>D4H`v75IlSKe~q*>
zA`G~E8EybsVW6>gEy4vaU;fuvu;9N&YAS96;F@6uBq#sZxPN{f)Bmehp%?%+1l<65
zOw678U*o|8?1ms4Kqwt(ba(&P`28D#Vc|k39bg!8>=^L|XslTAU*ps%h!-YIKy|^R
zM?@HK^(sOGI&N+z!hpWM{~Cu5{nxmC8*C#uMmBH$uaTcmd|n_qGf|SA0kX9JJGETi
RjsO4v07*qoL<FuvV1i`JbBX`}

diff --git a/images/icon/16w.png b/images/icon/16w.png
index 8ea89b0a4901b83510d44c70fee398eb62d49b01..5dd2cffb50b30643835829aacedb8ce2b0e5d87e 100644
GIT binary patch
delta 652
zcmV;70(1SS0;C0yB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Rc1_~Aj5>;YP4gdfGF-b&0R5;6xlV3<v0Tjl6-h1cWoJ+(ICfdXv3=2)N
zM3d!%E6Ac!i^P<YG6*3k2!ue4z+Nhff-njVg#Ot}I;a&TxPO-Dq!!J<hayuWf@-sE
zciX-6pst*M@;siycg}ad@0<hxhZfBZE6R>USx#jIp@c%;Wxf8XO_0VUfM_(julv@`
z#J-*f{QCK0S#WAv8kJQwt7{vNRs$CjW*M|rmTo4jC;((yvZ+6IoTAb)R;8o>@NH^}
zjw_ewcRWFFFn{oPU=W)iwMlcG=fD}6SzPPt#%MClo1AVoBZ?vbp<pnUm*Oeb9BPPx
zFP>|~)&CMpP7Znb1q{6!Sg_K91{qmv0Ek2)IA1)+@AKgqapM_rFRF<UpZM_p9RNC=
zj*fdhRM*v`HyD-_Rdi_4)~*}ZV-v<ky=>T6NV?ffl7BIoqLQub*?$mK)9}8169Y!V
z3YYEnasfb7wOHZz^fafN8oAnjo{90#02oasnogeL@QLQX)P)&AV>a40<u6LHV&^WJ
z&$M7PnFs~~?A=z1rfE3b9&CctCj9T}p4odDaybDoBqd=?PF~)H>biRJ@(XYez9tk1
zkZH-L#D7{2!1$++_<g?R8x)sWDcn+wwPJhx{nLK7W$8Oelx4z-!u>m)e4U(NZSJ}m
zQT=|#M!obsddTFLae#TY&OMV-Ra+<D?Yzyf%gONU&P&CCh9gA6VdY;J)~l+zTNFik
mCGV`NYETr#UYj6!{{WA7%$yAM%EJHv002ovP6b4+LSTYo)h}59

delta 269
zcmV+o0rLK&1*ig$B!BNoL_t(|+NF~*3WG2dhP{n<@F1d_2;%A_A_xV=O~Jv@L2wWk
zMR3qT1aZ_Wy*7b_##R#Bz_*0_U-FVXNqUWST_4-F!5vUWA_Gk*iUP7M3xU?6%%#A#
zZD^VX_I;<!^9(@{@CBA-F~N6)1VvFW0n;=wVHkq0>wH1mwtrOc(;Z}4Mg_~VKpe-Q
zY1*}bgo!{^Rp|Tvqy98a83C1?1%xPyU>wJ<5=OxL2d?YFaU2+OFWi4{rm8A&L6Rg;
z*EKG|_kHFB(=_n~UDwgT8OL$>0?+fHEK3-M0q=-jB+qj&3`4vZZa33E?feAj)hqL(
T6Q-m90000<MFvhpu0mjfqz8JA

diff --git a/images/icon/16x.png b/images/icon/16x.png
index 9292d0a9f084c4384caa3fbca8a884ec98c9e267..09bea46df4e8b65de622be2d75f9cc02b69c2f57 100644
GIT binary patch
delta 558
zcmV+}0@3}30>=c9B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Rc1_~AeE(dzY%m4rZ)Ja4^R5;6xld)?PQ5?rV@14mt<hYbVnrl-EB9=ls
z1YAU2T*S%MB8U`3hvFdk2e`S2o1j=k6goNRAh@`QLdBuQf`2G<sSQmo(2!ixluNny
zb7(zkE}DGD_ulu*m+$xcl$1&USGvYLN^5<JArKn#!`Av9@J>moL?qIDUadMWd|wYE
zu;_W*C=`N}QaN?xK+dnP#}B4$n?=v#tn1=h765*?%j2CLJ~SEtd_Lr<6TRwFw#~Dd
z8Jr{H9~9DQEPtgEZW00u`Fu=%u)WQvW|Na6Bg|*BtOmhgfhpSt;6Q|rjRrv!vDR+0
z)^7LBBN5v7P6vRLQoNj<Wg(v@qyL?)24uNfjSp68HNNfb0gz9nxKk|hW^Rsa<Kur3
zpHwOUq5+IZe9?{~mNqweST0izLjWAhVrg=cTN4ur>wkS~JdVp_W85tkaV(2{W4N@j
zff0#o95|f!^*Uc#EdVlF<Miawx5oKwmanZA`^GSB+gxy60DgrbK@|O8;9M@p8OPz`
z=xFc$xxckFcn2%B8kI2QbS85csxkcRba=bF8;6<@h(v<xg@XIa_gM{szKc7Ko1Vvk
wNHe8W+$X|SBl1)$l^f<a8j-qI>NfEDH?hdD^z>qm?f?J)07*qoM6N<$f+oKH-v9sr

delta 234
zcmV<G02Tko1cm~TB!A6GL_t(|+GAh<g1-g^4gU=c{*!`1dKh2;BoG0ltcb)QwIDq>
z4VVW~z{d9fzr8&ItEv4zK#T!%K$6HBkuXsPd_pn+q+tdWp910zVhs4l&kr|%tT1?h
z>;+BD{}+&K#%cgeGt7V%kSm0RG5miA%>cL|=mx;>8IS@61!Js+MBs7-Hvet|DRgv%
zU}(4yOb6)rAIuP947df7WMKh&VGp_sfL<aTji3O8X+Xnkh>6BsK>Q1&KvEKHBgnvK
kK>id`@&d`3iIVIL01&jE<(Xj{%K!iX07*qoM6N<$f>Zroi2wiq

diff --git a/images/icon/32.png b/images/icon/32.png
index 4da26c37291be246291ae51604090ccb216b4a8b..8fd51f8094a59f2c916edacd0a1aa1d65436af11 100644
GIT binary patch
delta 1222
zcmV;%1UdWY1=$IZBYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$
zdr3q=RCwB~S8Z%lWfXqy*Sc<X?c6ACbYUYpG+_cRP61<Ze#9_Q5f?IsKa4S1Kw~7D
znD`SWjQC3l7zq*+;xC571r=OKL=4fyVVp)b=CIjdYu#M>Wq-f#^}O#^w%dFAmG&fW
z+I#x;p67hL&pEH4X&O?pR*SdL$3ZQb+$2cS3Y1XPXml2udQ~j9?jIGD@swUj0U+b8
z^!=(J2nu^n1_BT(DnNfK&ax;$4F(}qRq;nH9#060vW`HEvS&H9kGwucUMp%Og4v@V
z!GGZ!sD6LZo_~`ulr=WO(bWxm$9DEC$Gx6@taPnQj{yHN(|Z8^uLklrV6~!bbt7Uo
zC!j^6S@+iT>_yG1uR%*B)G@^>833r^F#dY>DQFahOk%mO8CB11hjsl%DE0M_>~`Jn
zvB^n<hkrrf(h&ap`6o*LQVON&YBYU02$4Wj3ItsWcz+raiHydXr_Q(Ef&GOSvwB(9
z(7+elH}QN25}uhmza{7ADb)$xejNZTI}tkL77JV-AA_~!!Msxw9lxP7zGNe<M)P@D
z?Hg|uWSmLp$18d5lXIRTIzEn_FB|mnnQ8oc>N7;H|4Fe;LbTa<F_yQqz_#@X1WN^=
z^3lzp<A14-A{m_8*Ms=flujSMHVoguS$K~e=6gy4Kz2F}y2L+TgK-_e9LKSs8X)E}
z=#+cvP`Tx?l2CL`06fPgQs4I>obSC4#pNm?0MUpiGV&WDW22@N>)7!Un)=V7?%*L<
z?tdUZ=9KkW7a0Sx#Te1_=n#{6h@RCf?0DDH&wpU`=cnO1{wXTj9?1$Ic=>x?peegT
zvl`Qw!o8;p@#)*ph>lGum^`fipbyHbRXM%%e|;XF!@U`cQFg9G)4(7<UE=a$%VeB0
z8`XmQmEG{28!#=*<x;h+gV%^zN<k@LoB=^tNC}Go2SA|?UHJjG-`$_nL&@QQqjMMR
zJAXSNQ-jGQp1woyojs$|xjs2TjcfyiMR59V7z$y${qX`yScI+pN!0f2;|<6VwTTJ1
zyE=8cdoNvvSXp_e8;a=+SJ<4TA~^IN+}*nn{`H!%Zq}^fRIan3s)aYBoMc7CHh1cz
zd5~DXiy@*yqG77``HKhOI(nRsQ!-6JnSYA1cJG_Uj(O`A)KIXvX2f1z@o*boY@UmI
zy?oG!jxS8sY}&2dw0U8IP7~kx!Q#82^`TaMBckreR;~es&4%+|oG!i@SvR&8Tn;h!
z-+W%kMr`I0SY)Sk229M&LawRJ`Lbj%0AK$Z%$+=uc_t9D0ASoKl$Ak?#g=%T@_)z{
z8^_Bj?3U)W1f~Y^3Mb;8X(VQ5=uU7Gv8hQ!{`fts*P`7)He_=E#E2>tl4#r7j=;rl
zjgh!9##b>?-L;$F3Cts)sw0r3^>qh&IaLORE<&aIVbMZSRa_0YyL%7a6?QBfPp{`X
zUCj)=pl$JTDyA+erh|Opw?qC8K|fYfmmigek`2@gMsxsDAn4-=@%0w!Rx(N`WH?Sk
k&9G#%y`D18<bMGM0G9mdYD@h7sQ>@~07*qoM6N<$f`X@0{Qv*}

delta 721
zcmV;?0xtd83FrloBYy&~Nkl<Zc-p;}O-mbL5XS@k0R0ZN^qEUfg?<+i5fSks;z2|_
ziHL|GA|5=52M=CU#1;_`z622oq6D$Bc#sf8WD^ZRL$Y~HGTnc+T{QdbTe2oFhrsU4
zZ+6~eu{S>|m%ocj<(H5$L$w-5DWX)$iemA1hhcn;seT<&{(qoKMT(OXoyNzRy1SV=
zJEM`|VWzn`7O7N?q<j^IAshgv*9mcSl#k4)O1iq3E-#rfnLqEXudjbHKYf)(N5d=a
z?dAFx>*)#h{NyB?&Q{;q|B}mnuEz?>{1l9hG41X$-QF@iKRe_7@W6C<$TTx!dEEFu
zK+WgW0DhiAaetWP8yr;Y3Jn12o11XP(`k2op#k>x!k6Cmc0>UE{cM(}(?B-Mw7hI3
zAo9XYuKNFYoT*S?nwW?PU~$oD96+dTuaJ55kx&3@YijRX=?9?zR#(+Ao}FzI0Ai^E
zkdkSC-#ZkM0HB$qQr;PVdTJ$OGXVCq()E(-3s7zt{(q%+ea$pI?GJEqVZUPmz<^&H
z#xuGetOpz)`_Bf1&ISlNg!=ldc8vJ@K_rvvSpY$a!XX;~A<#4<a0~|qm^L?=@_BEF
zl@;atBAu?<AqYH-+!AzQ!J2?7fV;bhW`Um|-kPR{Kr8=n00`#43SelcO#moA6#x>q
zWq_+Irhlz1wKxBh5*t#Zag=S#IRNEvl|DUL%L&>rB#~e$7S-NwY(xMsKi}LffXZ-d
zZlM60*@o`#-S@%J082|uxm+;A*o3f(`L$tJ0Iw|uYZp2j;(mT^CEeMXwW4Dco0<x?
z)~nWX`!E?9;Sarx{_Piz!=!$imCH%m*(tQ+G)fbXkD3GEo0LEC6~w_ozCNkkCRsCr
zgv1JGh7I213RhmpfG{`SxGAqupXcTXm*V9m(P;cHXfSV|S7PET00000NkvXXu0mjf
Dsoz%j

diff --git a/images/icon/32w.png b/images/icon/32w.png
index 42aec600b303dd7f46f4256c1bb2846483190cd4..5642126343b35ce6d6f4c8d7cbe8fe94935f0fb9 100644
GIT binary patch
delta 1212
zcmV;t1Vj6c2G0qQBYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$
zaY;l$RCwC7SAA?#RTTfd*H_jr*A2>G8y|{BnF<q86EclqS&)yRLB>W5iw?u$U?cc3
zBF;$6oO8tBA80d%gFhrHLv&!7f`}1Df*`QSz%ihXeL(jC#(%BdI@iAEz0bDx^}Y6W
zX+6!&>%I5fbAI=pbI&=K5d;C07>0q3_oO%n2TN$*l$eNk5|ImTg0@|!(;vxYxjX)G
z#t-1I;7uh=#eo$Jpf?yH2z*S6SyqD)mkWM9I)k3)IIWd{xJ~<95W;}+y>(XD8orFn
z&N;0Xp0P13dVg*O)|R~r_wWeocHb!=Q&tgR=z`rlJ{p&DonDXoW@lhRLW1HvRZi*X
z!EZ#_;u@WPasXiH0?HVP?z#T~<m5h!hcf43N?JPZGMgpyH@iB~dj1@mkN<#{UrvMP
zd5P@e*EWlwWdNwtIfn)#?vyU3M;VFIrq2)?<ttjg7=Qh}4#~XN>yesB(i4=0(&Me%
zQHzYZnNgdj<Jwi3a#4jKRl-Iitf*|$xRg^m+k7%QCskvhrdhf&UpC(7xP^w@pW<5E
zWq665jYbou&Ac14=gh@|h1ocJ>O_11%wLcNjYbn<M=vVY7volUmt?&4!a023cmURI
z?}H~iaeo0YX>y8e>~?>jOnET<JvthFpi*P--{W9PnVO2nvYv`dpi%`uZLCBU+qR>0
z%iBnuHa&g-SXPdw?c#5+Uulz#Ye|S*ydn>~zWx@Qt7^n(7?sUAt)$P847k;QKie<2
z;`O3J*&-^urfv@sbh?PbFP{Gu`^e2`IdeKJPk(u3HJ;2_6mV=2fY;+e`O7b&v%?Pe
z$cW-X3gXS`4>2`8U3Hhon{4>Fx-zUYT2iK<zVR?L9QU6IoUWm;%K!C+-?4E`ff&!n
z6dW^{vX|zfqGr3INjai4(VRpJ5UB}h(m2z60`I-CNp**bNy%8AznTQ7RWK({49jP&
zseeM#f&G%P4{Gc2;3M+_;DQU1t;3{n$X}Q>j$(sFR(1{wOG?EA6iS`;>sY^frDUw(
zr&BN(jUWZdyRuslZS)H8lT$l+>?lfKScOY17i9A@X5A|*?Refh{$!*^)Y<m!*`+vV
zG?`)xL{XoHSGjf^`fD(D09BvVq41Rrq<;cR3+t3GZP+Lqcl7jN*yW5Z8ByVxk3S){
zg0<@~(ASH8hXXgRU-hMHvzRgU27_$vG26k|v*Daa=gWc!ZE6JytqmJL|19=o^l%7(
zXsG)}hgdH}3T(<Jz$iz+KL-YoY_X^cb2*35^woZRQNJ^67-kqIJOGVGZjm2thkwLI
z%kd0SZp|X!q)8T7NTEW@GFo_c+3mR5-HG-~t*W~Y)e-zM62DJBvjjgM`A)X*kM=8K
zi-qV-q6LmKD3=6$fOv5){g#w(!IJ0m;`S(IeQCGst#`02uR#1iI_e%!dYtOWDXb%Z
zC;9;So(e)t02uP4GRT|Izfpmt;Wb*43;HAge9v=gk~IX#%>UzgPLfxT!DKq*S5E04
a0R{k7tG6#sZu<KG0000<MNUMnLSTZCKTa_K

delta 758
zcmV<S0tx-k35^DjBYy(aNkl<Zc-p;}-D(<95XXf+KwqNJt6mlQ8WK?wybuM6<VH~v
z2oXUDg5ZTHA`(axC89<mN+3~`_<`bAqC%n1(Do)5g_Z<6J^v+2s%PC@-DF`d#NC<S
zoS8Ep8qJGmI2?W&jYh@0ySpEg$%NFD!C>&S-|v^0?hhK?!+-wx%#1&#QmOBIdwZnQ
z=}4>9sv;JPg$@r7>E`C<FLUyV!F=QabmQ^(gIY#;vbD8EmzS5+Xf(e5XFQk7y<^@_
zcXxLcD>WDlgcH;2^|Ib~I2?3;e?QeM#Qr_v1Z7eRY&ILkVlleDzNT)syA<o&+goBM
zN&EZzg2#*B1Ai3naRH<}g<>U%XEK?%x)cL|`s(URk?~5UBC1a@z{$yp;%gU)MAQM;
z+1VkMpi2gt%_bcm9}5YHyg+i{cOsFXUav=XyImaskH@oQ96-3+t3tM_jwk{M1Oi;|
zH>n4T0Q`PGH^v7C2X6y_Sn>c^F`?7b)0Lr61pvjQTz@XF%=q*3b0Hbm0+=ab_4&8h
z2T;x+C9htwSR|LrB?)kGaWVf!0Du9hGK_cX^}4JYkW3~edjmo@2awx@wzs#1a*X&(
zLFDs!ZZCk~io&5e0HjnZ{gE3(qtQsAP>4F6&PoWM&&U0q<<xW@0=dmdEJ59Fx6lE3
z0M%+$oqt{+C5SgWK`sPJ`Ktp!(EoV=X0!Qi0C4?y07%@80Sbizg~MU4H?yR~gtTZJ
z*LLF^fby40TdkHboS+Ot(&;otZm##iU~qGQqobp>_5j=rvErr(V4Z2GR;!85gNgyX
zUN5!VZCQpf31JkID#M}xtEL!?U8rn`dp4UDl5Z}P$p|AlMlq+;DQm3fj^(q(#A>zD
zYi>rf`C@4?d0x#%(P;G78?9#FmH@`%@fV!J+1c3xI+a)_TSt(P7~v2$c#kcdyCFYA
o)Y(f<YOm)^=ObI?x{JpD0qiIZqaX?LIRF3v07*qoM6N<$f;-D<I{*Lx

diff --git a/images/icon/32x.png b/images/icon/32x.png
index 99793fc669e472b33de1850e423e0d19979c9a8c..51116fdba52ce3ab42d98b0769003761044f5d89 100644
GIT binary patch
delta 1088
zcmV-G1i$<61=I+TBYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#
z_DMuRRCwC7S6N6@Q5gQu_0G62spXQ{ri3(>5wtu-K@mawYmqNj5ES%KK`#YH3xN<+
z&_mE$L=hxJ6wy=mAe545qgh58E@|fO%y>`Vf14XKch1apoPX(q!`;q3|9AfV2q`65
zkTo^cxYT3pqyK;z!)Q#?w6mh6<+JrpSOg$^Bktb`Azb`CJ~u}hnnp4~p&G`NVNg~|
ziuoLnGN23L0SPZZ>()d=$~#(6ctc+wJ^uMKDZ6$FL4IuV;<9D5CqJJcTp#rLo)i&z
zEP{WT3bBc=*MGi$k4tzuw6rEYo!k(lf<LI?D_Hlzz<_zb#O+>deb+-LPeWCWBO@^d
zR;HzyJ6V^RNu_Q#<>+BcQ19$4eVCY_H@|;V^Y}O!A>Z!x_tUYWqOkd4e+Q(DxzjVH
zrL?!8ASS`G)KqiuyhH8nG~oA#eV>4DS^f|~Kt>_J>VIumwTh~->-nO4dOAY5DMR6;
zjyQ##$0MB4G&VM`dAietY^dv?Lhb!NpXpRy>=Y41nV44&)q6m6TW&5j!Tw1huq8X2
zQfwYR2Z5)%yQvQ(LeVlgNzdTKH+y@-oG&2)i(RgWcSEqPU3e&bQpT02V#2RjtQg_9
z6`Dx~9DfP0ja9h1Vg;QmE2E_#lQaS;ifq;fyLKu_xR4k2!#N*SRng`0ax)t)#OA_S
zzg}87paX*Hy1F8M;>GV)R8XoGTVb35IWn4YjfP7gyCW~}-)2n$?A0eAxCd#J)3FLn
zqJH^uDn+O{;RPb$IwB#OGcJK+KZfR*#J?>~K!0#F;g&Ddc6L(Z@G$v}*g>`%wSs*_
zr7u)N%0<o)b`x+id5i3Ip{K`jhk01waA6@G#8{+9k7UjVPeC{ow^y$=3z=q_AfzFY
zlPDCs+S=ms;O(&I@#12$0NL?%W`>S<y<zWOdOT*<L_;DXqF_$O*Z;5~UXPB_Q3z>O
zIDg(sl<w@1%4hu(cQJATJKKZ7LFKnB8v*(s1S}s?VJr|xoWL#g0(G!+NtCR|PI<DV
zB;x%Kg!QCD#OU+!_>IW>JZjNSaUtST`~?oi$ier`_?Dqi_48l960e3eSy>U)k%v=*
z!oA_cp`pZ!(FPlV`QRJ0!~MdvVZ^5ap?@ew-l-`XhT01heSsa^a6Uy#e;@TAS{fFy
z2&e*v?Z|`Mac;LNQ4{i!{n!lLbPm8DIN|i-+5xgoyS7){FaqpIJCWI5A-UMm1tDEQ
z$6F{klG1GzRSU_2t!BAI#XI28`^N)ItLM?Y)CLbFIGTM@9Zoj|52u>bA!Q-ZgE^|l
zx(4oRPzyeW5wJ+$asy*qvXABv?4LD^_b5blmT<-&0R{l8*rQ6qcS9-w0000<MNUMn
GLSTa5l?Q(S

delta 729
zcmV;~0w(>`2=E1vBYy(7Nkl<Zc-p;JO=}ZT6b<+TY}#ffZ{92gSFQwqR!Img#Z74z
zinu9CsS8B}7b*xUi0Hx(@FNORkxEgDP^F?tt3`@QGik?jLMEiido%OKX9Jfo$-H~d
zyZ79$TyEgA>$)d8Qr>M#S>N~l(55t{Z2Xb(UaL?zmQ#J&LVuj>_<sA1>;5=DJ|33G
z#=<E}QiZ<Dlat{WA@*^(pyheTM*&D#d*wLWQx**mO9`?nM7ZgBD+i3<%H@v0^?PT5
z)KuwoJ|EI!m6Y#an3xCy*g62<XFh+FaiX#$1?OPwiR*^zo)_*&ITGtSet(Jomtd%*
zI8UH_PYEFDrhimyLcBT6g^U3Z^=HJ+#P|k0q0?s!;F;mgDUTe-4uDy>v7<1sh4|kn
z6uJZ?FGwyv*8mpz9xmY73V>_K-(lkfRE^0PhAgg*7y-BgSE_FRFZI9(z-_oy72`|r
z%%K2aEL8vk$aBQInxS|Z0bnutij<0D{M%x&OU6t9B7Y^DQZ{u5sC+j?>U~13Sd3wR
zBr5<Mo#_Igfuu6bcNz(vh~za4R8n-vK7h1MXr@<=gA^b>z#Aovo^tO(eE^g-AzEo;
zcp5++AU%I8n$e)#L<XtOZwRs14?)^yq$B86q+?wZns1tZkf|HS3FEz{X;!leZdnIF
zS<=*td4C1J{tJLb4S*RN9{33NJ_PCJHQ7Q^t}A%Zu)zT;A5{7a%;#{zGE7-U&NnsL
za9=YM7y-DVXvb-UnK5l+B+D`leTVV6n96Dd;5v%Qc0$34gp&|Qu}ao%SWXznS=ku(
z_lP@5_YU72(K(7;L>8nO>y=}9w3wX9(A!OAK~lAt^j5Rw$Bwge7^~Tq=dF$cC>BrA
z3oo!AvQw2T8YUq*!ZB>TJ-2Z6hD;E?{}ez1+v_=6cpIx+ZP@r<mi}^5vz<y*00000
LNkvXXu0mjfDFIPa

diff --git a/images/icon/38.png b/images/icon/38.png
index 37362a0f109bc1c58a72704ad47c08b8f569a7c2..ffa99c2bbd17b86790fbe359273aa570c59914f6 100644
GIT binary patch
delta 1615
zcmV-V2C(_o2Hy;jBYyw}VoOIv04D(d0Q(+QR}ugK010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru;Rgi*5jp~6U}*pV1?)*gK~z}7#h7VqT-6nTzx&qNf@3>FY=?1Nh-{WD
zfWc#ke?U|PLZD?=6hI)+B@LjcRBAy1gpi^DLPBf;QK=$DsDD*c3Z?Czs)Qtrh(U#<
z5CS&THMV2YA#rTa;x})*{4fr-=Z$CVIB=x*=iKw&{q8yEo_pREQc5PI1xE#bAsu%k
zLbM7^H8_PLZKohz_ka=!|E>%D#mQr00;~lm4Ez)5kgkVsSt#K!2yu$2B>vbKN+^WT
zRD7$jO9`3lx_{7Z0Bw@#R-nT#*eIrfH*}25yYJ##7DAa{IO$82NSH`l5;c*)w+bjB
za}Dqi@W6DB{SRmY7~1g?N1uI~??O)h^?fY7>E>}@#~tX_!-?r&uJonq^!L+y<F&J&
zLDi<a1*9B*W)Kky(e#I%XblYjez#(%(?h8WMPT>$ReuH|1i~~CritFLgz(B$2-7?<
z?DX~FkL7U&2Jl9Pk&c73?IKWVSvZ4-(a%@{piJns>GS!SOnIho7_+&Bsvlp+!fSq1
z*1pi&OLp&WM&9@<&KJE!<L>dHB3%&}zBl6}T0Bn8Pku)A^*2@=WwWUXv*`|;{ys(m
zz;N9Pz<*{a4{B{K_1hmOvg-UfC3-fMDw!73MVU=<$G6-&XDI9Q&+v|ZRk6KRsbOgO
za;nx{6*y)eIYOcPQ=I;OoOBwYX&8--=!r(O+C`X4my&&J*Q^#&G1zHWtq;_@qoe$P
z+au&V_XUpYjZ2ALb~(A!+b0QDqV9ywJugr{@_&~<mxLNG8((nz_b<&l^h$9lhy)wP
zV!?T<X`BivPJY)3H1xCCKz;0oYl$S=VV(htz+^y80T?^5KTvPf)zR?S6V%*(2cea#
zP!=qh7qH@GDr%tN=-=L;X2ZtdN)n9{-*gv+D|^Ym*GYc=2Uv$b#vL52&^^U-ie_oc
z$$#xg`te5@d39&t`?Z@kv*^yBRy0@UtzG2aNs-^bKkyiuvawdIq<-6Ww8eD@Mc@}~
z>jaq9-A&&u8)iNu4TIWEo2k9+_R6dMzIPaYbtkz!yUW@x+^~^Fo9_ncyV|#Hu3bSZ
zY;*LPr?7i^sJi|JA}dyweJ6IwrI^c>F@LnUj^RK3apuFNx*8M(JpbEJN?#&vn=kMG
z4Y}0b@(1%d=Mqh}6S=sJXj`%(?|u33gN**;??w6r>(*2Ez=NRa2t^<rH>Y)>3xF2I
zks@TWVC@wZffYVEMB$S|WcThSw0s4T3tNe_CDG%jmwcyo(_Lg!Dg2S)Df;N@)qe<M
z{J*CQU7+hhmEWJ$wzhkEuzPyQrQXJDZXvq5qvY;2>gtGfbQF8d^G>3>C?np`5c$r1
z9DCt;jy$@pq+NK`1#_(YCn<g|%gF1mk^j$u(h2^3fK7zPE779+mNma%!Zca9@m92W
zysWKp=2=9O?ZMr~;Nki0$IO<qS%3V?Us1LGYV6)#^6&qf!snmi93GeyrWzt`Nvf{C
z21VBczf(z}ofTN*n_3lWZXwj%LhSN2xasti&<I1vOf;7KM(%_6vAVkE8SLV=sX3tQ
z7)zE^oObT<<D?(k4xT&591G}Rm1vCUg{^bm3--VOhwt5j-Sgj)7cAw$f`1x5O=bA?
z*X9Iu?ByNw|NKs@gCEThH?4dqwd$JUEj~I*`pG9a`oeQWS}!7!Y{&S)nP@e&Q^M(v
zj^d`%SceW`9Xv=bwHGgwL6#{IL32(9^Q13Tt-c;qb?Px8B{HAK%je0w`7g42_8>HM
z{QhFnYNh9aFOjZ0-U(NdPk*Y4R$q_wC4fH>!^xrS7mC10B#7U$Wyazu3l@GZho8;j
z4G*7q{7eQvmqiw=ijzEk&lZeCV*C!y^9F-F_6o37Iu6yh+)5;Q3HkRr@rH(Q1_wc%
zr$fT?(Hk02YifwJwPP+ji;2rZp=&#Wt~z7DZlG1V9@248!l4Nl&q%unMd0Vh5W0@g
zHKgry3PWGhg+4X~>>D@(*eZQ_lTgGt-^Gohw4D!yq5rlE{n^R-uK~+ZXI<U8hdKZN
N002ovPDHLkV1hCgD$4)>

delta 832
zcmV-G1Hb&=4AusaBYy)ONkl<Zc-qC7&r2IY6vqPvq0nn@y|z35l8A_iJxCA{@!&zI
z1TW%AJc)>i2r42XB4S0Xv_T>gNE$*&#RL%}{y3CPc6XBLes{BLY<9Af{gDLTC7XTo
z$;_MgzVAgMji1fUcV8%tN{aGR(lmwCYAj5XRJ9_>a{M!;Uw<RK&!=MXy+r8`<0VyP
z<l=&n<Ku8GkucW+WV!r3l1lY7f$2LGGoaFGMxs$hdV4!#V`Gfu^Cq0m&<s|s{xQJt
z!%jh2HZ^5}DN4Z!j7p^v_2hVTl##_nMwXUdZDz(?aA-)($I}zjL#f&XW)SCcw5=o9
z-!~k(26`^X$bb5J>kz3Qrz052WHeWx{(eTbx9y;9%a)h<elr;#V1UAH^_n7D#jh{0
z-Cgfc4-c(R!ZX<TI3twu7k+$XB$+hx)9I-hGnLBg^P{7Xz;<@{P%A6^1!rd&IX`D4
z77Gci{$i7zoCK50JcHfcIfHF%gbyYa3j92Fd+Q8_SbrKA2pKG!<%6N%@?tETWn^-)
zOGmk|;GPoVaWmKh-?2=l%6+k~kCE$Zv7Ci?M7=~p76pT<X#{)YaBIuGKEAw&CspLO
z)m1St>~#Ht>DsIuvHzjyze6ELOtq8sFE1Gx92E19TQ19*305q&7Y{gA6mnS>hr799
zWO&%!H-8k14TkNjRBDE%Y6lQn3vvcWCIW}c!SjV9w@R3z{Cykz>2%H0jlvGj&zrT<
z4UU&qe5nf&LruKD=Yt^xx&mh1US9m6pmz<dRi(i9T?MNrOkp+R84On)$1pwZ4mCH&
z7nQihfr4SNMwxtgXtr!<(JaGnpk8^63SiOd1%C>5aNvJl!3%s}V4?-wYv%U^28XR0
z5s`*>WF!PV1~4=uqNT?&bm?nrW@YfD$MSh9l-c+87`eJ?K3>RgEP&@IQ6fNYBLZWn
z^88FYKIw5As@P+wiHXibVNLEB${O531iA%kkk%kP9S3(GOQjF`Rwit1c6MgA`;9ZN
zAUO@bv4*9=RP`6et<HnkRH}z)+Bcp2ci4krTc9dR5(DY~QT_pNvk-u$eWNe{0000<
KMNUMnLSTYz!iv2B

diff --git a/images/icon/38w.png b/images/icon/38w.png
index 555eef9afd0e8046c8f7f6748defe0f7cf7c88db..733421641828bf272e1a8132e865892488e2d9c1 100644
GIT binary patch
delta 1731
zcmV;!20Z!u2GR|XBYyw}VoOIv04D(d0Q(+QR}ugK010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru;Rgi+1sWD%{lfqN246`;K~z}7#h7hyRMi>Be`oLAy_-PZHeEwrAxROC
zkdTl!+s0HW+X8CK;1uhKh%JMyd|-6yv|}qW9V}xVt0Q*!V1H*~t20)oj>yOejuauh
zgci_3rjSV9Hzbf(_I>ZYd;5U~ciFqi5`%qa?w99z_MG3I^W5kB?-4}V0bLb9jjm}+
z5F%HSB#B#SnyTuWrVZFrQqH&}>#69Nh=P)V^+1uX>x6<q>?tV-A#MqjVHgAh0TjC(
zNs<VMLY+26d4J0#S#<z8D)%m+C>#!9vnh;@40HPA2|~djLRe-PDuO*Fm8#l0@(KzG
zg+eHbQVcW#2X6#h0${T#{OvDI{Q0$4_&RLMFMq}T53IYkwVGBj0T#U!8HQot?&+Qu
zlqAV9kHun1stjI#^<^%(-57>}BuQx#{^%7GLI~WwJ%34o2q91u1*=UVH@|>8$}6zh
zY}e!N-X4MhKmC1uTpb@nRaMk*7{f4P#t8<44D`Fn&CididHKc(y<X3hQ1+A*N^f7l
z${((wak&e{Zl5&2ucw=1pB`fW-uLP4?uv_#jgG|m;=m$$WYS5polYM9>1I~1S)24W
z7ZlCq$A9ZL;O^}<1=BTcYA`0Li!4Vrzj^)z7MCx*=^E5^otC4`iRvN=ut|!0^VTOP
zg$f0OXqpNL6uW{fTd&7@x;hydx{~xCNg8ZnSsC|yf0b$M%HSYhw4JBFx0j*IgGjPW
zLD5|D3yW}MXOro0aP%La+|&vu4feg2_nP`ghku88X~%X>wH!}aU*BrHo0CV6d_}Mu
zUgrs0aK~a(|A7xbNC-9YM!xgcrkk$GxU<HdnrfOjYxZpO+LL8&g;`8aeA7gq*K6u;
zT<&67T|M#)1IB}y^b~+|pPw=HJ9Bb)`nesfdt@Vv%PW|jmUe5vB#XI{*uQrV!C)Xk
ze}8kZVe>C|>bKk3u=xq@TE2ogd3nj7vnF$j1G>5`S|jcH!%p`8{T<T*9)0`?9@_Y`
zsRf{>($d__$zw-2_t_cKZXa!n%F20W$4;C%a}Yuh4u>^q{kCVn3((Qt#)GR?(Dt9!
zgafqx`*UnI8}mv^vDuWw+hCC>npe!74S$W~7tSRR@J$Lgba{~X-hK<8*F$;bG9nTE
z%XSeCho@W#H5}&kU9ZsH*}>{H53s0g$&|mTuD_Gw(o&qa&0){GZ%>+=nVE&KSU`_(
zeZ{h!PS!oLk<Ruu`g*!29pGZy1v=W>7`W6AFd<nITI#G>R8&<nbonwJ?QL=K<$o(z
zv#aS%%B!l8Wf>ua7OnZW0UX@FkDbpxlXT(EEiPfvl5)x`mr+?$OSbd2gt=D+2l@H>
z2e~>v7UTc*?|#qSt{(v4lC0a!WlzMosn@!@vxDx=4o);5rgZ)S>b}#!svoV55slHU
zrS97ee7tXOobs5mT};=;Mn*W*a(|qr-G5^DA73<`44`c3(&_cFuWEjumwkKQ<9zE`
z(|AT^*8d0WnhMtOc{~X<+l+$Q6os`vd6;acbIRO#C8aD(&`JjS-7~Al<}X;tLyv7@
z#p?U$?e5~UfBloLi|zFH^?lig91f~#>TunAKj|5nrsEttd}wCDDr@UWOMg!%Ej^v$
zZ_cN(rWU`?PbljAwAyT>XJjTk$j_cR%@-Fg%rIDWZOk`idPZi#RWY-X;UQjq;dyjj
zn`VufDA?3lvng9zIqjF>lH1L5Pd`al$HhdK8A-?<6Tv4*5+8l=enQ!k$im?;@4op4
zPd)w^=g*x@EPG7mjPqn>Ie+4kyq>G<e)&b3cE3hNbq&jE>nSQOA<K~+qq|0jhZ!Fq
z<3j5>&bOZBMDt;M9uL7OT7=o0a_p6rA#!qau}Bh;sLpK|1_8gHfZxyIPd?`Or-zVa
z2_Zzxx1+9WL?Q;drlDzCQuSn!Byw_dC+;*1v#lH#LXcNb$fhk@Cx308p->RN&xg<J
zWqfS(`s4L@@cX=kLcyeqeAAY#<P{Vmgh1DIkJ*jlJwSt|smQXGu8xbGZaKl&=m-P-
zZY-9WIV2*H2y^oC$;@(4Raeivl2X)g80)n||A<Sn9=s9E20RMn>bj1mswj4Q+_lk6
znGk|tAb@POBFi$Gsyz0|R_hxs$*RSG{SQt88Vti&EQI*R*Kwn$s_LNCYCY|etS6)W
Z{{=E{dTBICgERmD002ovPDHLkV1f_$UC{sl

delta 869
zcmV-r1DgEO4f_U=BYy)zNkl<Zc-qC7-%BD<6vu^yg@yg!LNWBENE9IuBwzByU@^r|
z2qj4rQ3^sUM6C#ak*L{HTKck&`>=n*!tRoF_kM@2SbCl7IHSUOac0i_%$#%2`QD?`
zjr>kePe1i~J;&qYW1HH)e!ow&v`(k<_x}F=`_t2tUB~;i+kfpZ^oAxLpim@}$&h3+
zsi|eNS!pe-`S9>iqaWt;7#O`_7dI3N1+u=rPF7Y{7Gf5Qg<M}>leZ7DI|fEW_!Ad#
z<D#ILZEkL|(Eb_&qhTD>>-B*W#~T|PWM^lGc)i}CIh{^vL6gZO<m2}CmQaS5F)$Ec
zU0n@k3Blpvp?~C1F3G815)1~XrU(n?M6ipCi)T3?gTX+;;qWkNXEC48$Mst*7L|hm
z3cFQld6<^JbAcTk94LlrG#XPQp%~0+wIVsW3pblhlFQ|!`jk$mrJSL=Y<NA9NN58V
ziA1<ie!ri)pv&bV$H&KHYimmzF!ta_OQlk()H20jH-9%b6Tw2EkoI7eN`+g;YPH%#
zFyxZaXw(+$^74`khK9?_G5Q>_+wIE<rN`ruEeR(lCsMMj4n~#53-3X_UQbG;l2FY;
zKB8ZuAd7-Q)w}~6b-2I3FWVofZWAu5sBM8jKnM(9nr$$u&Hm`v8;ZUi8ZmNema2bt
zc1BiLSAT{4W0zA^`z(P~tJRtE0bxZWr*9?<S1y-{*=&~e4aG79dlPA|&{VSkLTf?J
zAY>wN*c?1x2svwE-EQ~yyIjlX^RG&F6uzL_?Us6_92~E#%%v_w3_X!5VJ;X_U@2g1
z_ww=&4Si`~(>ewIUn&?Yn4)S#F&MTw!r*W?WPhQyx3{^X61!McFf2AIljHHYbY#O3
zjT!ENdgUEd0E?rZs$j8LZ0=bFFY)IB6K&v1E59NzIGlD65jpU#t*xoA#{h=Ih-m9!
zhEw|9-k#JM=F($SCJ#g^do&s)=jZ2R;f4Ih0=SMAB?2TnBEV3k)oKkEJ?W7hs<1JX
z&0c0(I26|8j-lA#4kA!4QPs3j;W=?|M^)@s`YAh1n;jh;Nyq)snU|Ud-&kWrgWX}=
vI&lt*87K|uH%k6P>%lNH3e?9y`XkGKfrId>%Z#l)00000NkvXXu0mjfTSB4K

diff --git a/images/icon/38x.png b/images/icon/38x.png
index 265b7c03b6856fe8fbd433aa1733023ac727dd96..a0cbf099fe19446b6f9c3d8d033f763d5ac8cc13 100644
GIT binary patch
delta 1609
zcmV-P2DbUl2H6adBYyw}VoOIv04D(d0Q(+QR}ugK010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru;Rgi*7Bs4w+o=Em1?EXaK~z}7y_ijGTvrvxfA_vOZ$6&i#N$j7&m?Y9
zMHH1bvZIouUqYg)S`Y#WBoIPK>`>aWKw?J_&@CGz1VSnTfqztXtSqtVqEuOws%c@;
z6be=%2Pd(qiN~F<_cia`%OYcI?73sVag!d&n>)w%{O>*I{LlYgp|xhq^umG#ypU@B
zE#NUr2#5P<iPlk~b)z8V??j{V%J6Su3z%M5C<3nmPp4WFDMdj_#C-y#fnX5B5`svn
z*Yi?-Q8XGcfPX#Ydl7g#RtiT-nn}Xjoeq&w2yt)WX{{+*7N4D(;zT}Aq!f86p8<Xh
z{Al-$Ed!qdcy)c9U$3q4N!SmLALnb;>Q-uR<*r<r1CT>Lb6RU|M$yEeBwzuy5ZFRs
z?b>)R`_<YSt5Jm38Vl-M>%*zEgb>_}qD&iFKwe5b%YWijvB+FLj}QV0-0An(OcL(&
z`~0upCs2yM)+ob1p;D~HG4*_Y$3@w@9lL3|FQ~(|&3Vt`tJNx>DV6s0?W8GxZMRw6
z*x;(~lMJ!ImTe}<$l3@nW%$SK76#^BmltX^9(CPJH|tpz&s8dP(v)jqNXKw+6IgpR
z`uGk!>wkG%oSUPX%S~M5?{>RJP~&3SSvP(#pXa-?vtvOe1MX9RBLsOVcck-n#@d|-
zm?H#_dmaxP>M2r+<uK%W7;-y`2$bSzF2{p~0!MQ>YL3I(oer%GwL3Aeif!{$xojlL
zORW|^zkS;nxFjXdPEYgSIHqMN@X3G~3b8094}TR3BkL<s#Nx)r*xT@xVzJpg5b=)i
zV9~NhIZFsihIKI@)%#&1!1`*G22-u^4YzVUpXa$sg<}Wk(uq@Ps)U|WECm7QcLA`3
z;0u)sGr1gpZZ`SA_gRhO`vc4}IBg~gueVy9H#C3{g7coo8Q0~VZkNlQ4p)0UmV$t+
zeSc_*Y3qdrJ=|qidOagYz1ePasnz0hhYp!3MM|D5mwB>W=2{SNsnz10ZkP9ZJ@h`n
z{&eRKr(O4MNh~brSgBB``FRa+EeQC|($c;p`%<mOQ)9sGw*Q17i_IpB8yoma?d$)I
zYLyGM8cOSAyZB?R_YV|B{Or~(UR_^jqkrGue_9j@T$r8ZLaoNMy+376+xE6%wtg}@
z`%{3bZS(D;N4XY;drBW)DX#Q-tV9v*H06+G;q4LB5@K6{{KNO@8!q7aN`>E^Jjt1<
zDQqbbLIlGKRs+1Yxyj2bE16PNkdjAACFWh1bDqberP5d#o@mYYuV3fyh8lkPfqw^h
zwo<v<OpS&x%bp2ZI#h~xyIua)?edpai!-jvR}LTMWU)BfWkT?Hxy-+VV5HuXgU-q<
zUp&iU$Z{C66a;*)UgxwyubnCuDM^{B5#+sQ?Du`2ORbi1Qj{$VE8_^e=fJk~mr0dI
zV|4$=0(Qc2`0~sQxqVKY6M}iyrGISb)b%(vcIC$sisw9!m+E!CG&94$e4j?I$Bi)L
zqclYfd_G+)@_ePj6P`C#UUxGJ#!SGbEQ@*9r647zU6)hEBA=h0CQxcSWfCY^78Tnz
zN};tl=4!8JO!0w%xt7HvLtW-bNmXVq&s1w(SzBXe0^OfU!5$fC_k&oZ6o0>1UFD5d
zYrNXX^7&>;Lpw>h-05(3Ozn)bx7uxf|KW%H)A#q3Kz5eTw~C>gmcx)A-nc<Em*WY~
zV_|BF<BmhkakeFQqBZMr%*`m`ec$KJcAJ$b%0#B7nD)+6(AF`>!GawpOb5ezC5l*$
zV-}lDBp?S5C|jdU4R|WiI)9T|*%FDz9EZWoR>HtzH-!+K$me;nUf=5#kU%MVO3_JE
zJ{tVB)0D1K_)2941@L0M&WXW;ObV-}8~Y=0G0~cD9y!7}&*O5Z!)B7O8plTYdk{;3
zy5mr>ZO(cg4;2b*Jr>$R{K53pIR(4{JeF!rUuz0dq9-{0BqoF)NJ3L`cL9-T{gy4n
zGosN5b^sfIbAXFl>#qwT9{wa=6#GiOmy_~0qS5%}@cRD&oJp=8mRC7n00000NkvXX
Hu0mjftBMTf

delta 823
zcmV-71IYZ@49y0RBYy)FNkl<Zc-qC7%WD%+6vhVxL2%Jm+R5Dc`&@~nh~h>hQtCo*
zp>$K+h#Ma$MUYbQfmGT`1T|C(p#*EGNL8vLrfDV_zc1vLaguxI&P^r_915M8bAEHr
zbB^Oge)k;bSm1f5>q4wFe81lE{V+>8@csS2LaYTsoN`pZZGXo(fg6_j0HDHmt{c9Z
zn#xqlu+iv1)`WPr?l{N0z#2l#@P<l0A6^<A4bO~>3`H)FjfGpD*M=iQ7g*ExtGvh?
zhXp0&Ds0j=Lg;fhm=M8t&kJl67oqs}#6)-}mphc}<Ku0E=M7K)rw}1Rso4ca;!pW}
zkj4ei5hqlb6o2H<8!k*vYC}Z2vnSZ5>o$^rrXh<k(y++FyEsXe-c7(;gAt0^YFi$3
z@!J>J6P%PS)DO5^r`sBA25%c^4DZ4429&cttw9(w^~m*Q{4W!*CCzEw*Tl{ova<yD
z-@xBYz~qB*SxGnvQ?Uly?WA*D9^oW22iwuqv9Ag+#(&b;tih_Ts{|`+%0v}Puk_i<
ztX+8vEhniYyaoJRLXg{nHB}E5AlnLe#)a|7emR{2tP%%{Dtw#}$gJGI4SHj=wms04
zl6YB>35NPtbL1PEz8xEJRZ%)rvJMxYGn_J*<u%W1w86drEKNKVI*q)R;`DZ4<AMPk
zCzeAn%74BPEzVSF06A-MoY^x3WOAr<(dDv*9SHH~zgVldZp$X4c!D?aQX2*?R+W{$
zrVA5cPyD9I-bF=%Wez5@R~3IHg*%4=rt1{tqXw&_oJOp{nCf)HHG`Hjk3>)nl?#K8
zvH3`^<e2;tZ_e_<Pc$jKhtsR-Lxr%#L1*O)7=P?{S5eZ`F>5f>25wvVt-z=-=mUx$
zycZMNku}&-iq<2AU+E9gY6|_%V_OC*0#^2?fcyYOarbikrU71Oiz=ijFUl1Gmny$3
zmnwr0<x)kip=OU@4K=G<L&?Qm)gVv@Dbc~R=i+WRmph50d?RPG*PT^obmuilp>EoU
z%rIc9T(|bz!*U0Ts$B&6$E+8_QsBP#Tu8@R{sA^6H-cz=R$>4E002ovPDHLkV1kY#
Bio*Z^

diff --git a/images/icon/light/16.png b/images/icon/light/16.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ec57b4e6a6c98088abde81f61ae895977599e11
GIT binary patch
literal 654
zcmV;90&)F`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;RXs8E*XaQ32guX0vkz0
zK~y-)jgw1AR8btpf9KviddJsjN%R<-tSF>t!U0{FLo~PuEeZ<TB^9+vh@f0aMYRY6
zgGw+;k!T^bklIw>B7`s|G9Mt8IM_=xq<LD-sQ(s@7sglq;cUKh{;%&lA0h&9R8LPE
z24pQqH_btyQbbT9f@T;Y&((`rMKz~1d;U6Bi>dKn47Rn?)7TuIot}0m5kV;>XTJAh
z*i8U}Uq<-Y@Q`nvT}%f<0Ay|1MCpwy>^NRYA{wLBRg8!zW1;dwa%g0fj*64SBhi%3
z(H~>T>>L2LtV|0x7LVB9)M_Pr@7=<6*vIdoVJ7@NIDO?yR$5XZ6c`0Sv)R~IRe_n8
zi#@-D&1EIaa-uB;HWcpzU@np1dHE6gnp#LiV=I!XDW$|yS8D<8+H-6y^~^IqHbHm&
z9iHv=(tH1LN@7X<Wt38)0VrL!F4A(cse1X80}a>6DclM`JQC&o^#=U68?AS9NkT0d
z&rc35JL2c|4&K$>Bp!)kWM)tk_<*MCJX*gS5m6fdiCxvlaQeIe%*3XMha;=2(AU($
zxc?K*gJsw<GYAd`7=6_VfMaJNW?t^<1-`y{%g?TE0xw>t;JTU4q2{|Q|AU!7e=+PP
z?%K0tyPQn+4_c(=yZ2CZx*ErJ7eI=vMpA|FKyzEp{!14q@Oddn?z~d;K6rv=v(1|%
oY3FLCX~DJHS?Ss&a6&}*2U>>G5xLRnhyVZp07*qoM6N<$f&&m9{Qv*}

literal 0
HcmV?d00001

diff --git a/images/icon/light/16w.png b/images/icon/light/16w.png
new file mode 100644
index 0000000000000000000000000000000000000000..6287ce91db1863933157463ada15e55d8a8a86f5
GIT binary patch
literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;RXs904&;ou2ld40xU^H
zK~y-)jgwzUlVKFbfBW8T-@Z8-t_0~1R+b?`A!~|8DupIkg58w}1Iex`vO=kmMi&Lb
zDnr47ypTmvAw&|4$_mNEF2q1`X%zE9!Hb;E`E7oq3+D&^Tb{f3ocDRoInO!Az>*y>
zTjUeb1vQmTn5-z%Y9!(Zei{IT(b#zI=5_Pw^R<T5w6vt)>B&jDA3dS-PKz2-)w>da
zwzw!)U%8}%e~$+6RJ%F8bq6lVic7L`G9wHB^OtN(Pp7*6A~98!0gTJc7DWLdI5v(u
zzld-sv?B9VaDup|0bsS+biZ+Ri9T<u4)#25r>L@mUn4*G-akM=dFh&#)(`~8#+L#n
z6D3uZ*c}d>#c4Q;kFKkUwAzuAcNl=hSd23V^YD3FnV*~6P*edl)irzc4B5_HhWfrR
z6`Wvxc9yUHcf4rpKoWvOM+$VHS(X`m-&-O92qE-<&2FdTqo0Ph`|Qlz3qUv&;$g!L
z+C9zszhyxUiFeare16>$d%B*|a-p7ZD1?%dLhs*6gb=tSE5I%3e_K~kbC$w{`jK#$
zxtW>dQ}B6P8SWn-zw{VZn~guC0Y1O(0U#r5KX!*BIYD2~TfX&v;=`-%mHTh8aNF0p
z@g6KhB3KlKnroNYzGpXqq2Yw6TgZ0iQdL*Wu6>yRE5>R}9FzL&L7VJuyh>qt8HMF#
zNp<OJxrfPYR%6kqK7|}fh*NP*lQ(nDk`R%&ro911{sD~@wZ`#Mg>nD@002ovPDHLk
FV1nwsE%N{X

literal 0
HcmV?d00001

diff --git a/images/icon/light/16x.png b/images/icon/light/16x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ccc3e502e6f341d369e9f7d896a2189346dc6b9
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%A+0*}aI1_o|n5N2eUHAey{7#QFa;_8!G_-9!S4?Ek(d1XK`4pxwnEKE!+
z%uGN=O`y$-nMKWE4i1{~5mwq=QO?toJr`y9U+>LQkr4d3q)J+dcV}f(u7|0SqQuFT
z<Yl>m%Rd@90CjSe1o;Is{Qv*o=hpv^A3_5@uR8@4?eKJQ43W6(+kacES%HT|_<|_o
z&K04z|Np<hHtW_q?sm&JEdspC?|PU8eGNCLRj4yetMp~7*mGkM<IdS}E6#BFEofOB
zDyq{^B~l@nvYKJu%~QfNbQGEdp58gFcB1@(mhRO9Z{pqkv(i{Cr@rFd_J8BqUm*!U
sJ+5z^qg}tx&UN4A>9g<V*P36Je#gQ(-_CimG0;s6p00i_>zopr0B7)fumAu6

literal 0
HcmV?d00001

diff --git a/images/icon/light/19.png b/images/icon/light/19.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ec57b4e6a6c98088abde81f61ae895977599e11
GIT binary patch
literal 654
zcmV;90&)F`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;RXs8E*XaQ32guX0vkz0
zK~y-)jgw1AR8btpf9KviddJsjN%R<-tSF>t!U0{FLo~PuEeZ<TB^9+vh@f0aMYRY6
zgGw+;k!T^bklIw>B7`s|G9Mt8IM_=xq<LD-sQ(s@7sglq;cUKh{;%&lA0h&9R8LPE
z24pQqH_btyQbbT9f@T;Y&((`rMKz~1d;U6Bi>dKn47Rn?)7TuIot}0m5kV;>XTJAh
z*i8U}Uq<-Y@Q`nvT}%f<0Ay|1MCpwy>^NRYA{wLBRg8!zW1;dwa%g0fj*64SBhi%3
z(H~>T>>L2LtV|0x7LVB9)M_Pr@7=<6*vIdoVJ7@NIDO?yR$5XZ6c`0Sv)R~IRe_n8
zi#@-D&1EIaa-uB;HWcpzU@np1dHE6gnp#LiV=I!XDW$|yS8D<8+H-6y^~^IqHbHm&
z9iHv=(tH1LN@7X<Wt38)0VrL!F4A(cse1X80}a>6DclM`JQC&o^#=U68?AS9NkT0d
z&rc35JL2c|4&K$>Bp!)kWM)tk_<*MCJX*gS5m6fdiCxvlaQeIe%*3XMha;=2(AU($
zxc?K*gJsw<GYAd`7=6_VfMaJNW?t^<1-`y{%g?TE0xw>t;JTU4q2{|Q|AU!7e=+PP
z?%K0tyPQn+4_c(=yZ2CZx*ErJ7eI=vMpA|FKyzEp{!14q@Oddn?z~d;K6rv=v(1|%
oY3FLCX~DJHS?Ss&a6&}*2U>>G5xLRnhyVZp07*qoM6N<$f&&m9{Qv*}

literal 0
HcmV?d00001

diff --git a/images/icon/light/19w.png b/images/icon/light/19w.png
new file mode 100644
index 0000000000000000000000000000000000000000..6287ce91db1863933157463ada15e55d8a8a86f5
GIT binary patch
literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;RXs904&;ou2ld40xU^H
zK~y-)jgwzUlVKFbfBW8T-@Z8-t_0~1R+b?`A!~|8DupIkg58w}1Iex`vO=kmMi&Lb
zDnr47ypTmvAw&|4$_mNEF2q1`X%zE9!Hb;E`E7oq3+D&^Tb{f3ocDRoInO!Az>*y>
zTjUeb1vQmTn5-z%Y9!(Zei{IT(b#zI=5_Pw^R<T5w6vt)>B&jDA3dS-PKz2-)w>da
zwzw!)U%8}%e~$+6RJ%F8bq6lVic7L`G9wHB^OtN(Pp7*6A~98!0gTJc7DWLdI5v(u
zzld-sv?B9VaDup|0bsS+biZ+Ri9T<u4)#25r>L@mUn4*G-akM=dFh&#)(`~8#+L#n
z6D3uZ*c}d>#c4Q;kFKkUwAzuAcNl=hSd23V^YD3FnV*~6P*edl)irzc4B5_HhWfrR
z6`Wvxc9yUHcf4rpKoWvOM+$VHS(X`m-&-O92qE-<&2FdTqo0Ph`|Qlz3qUv&;$g!L
z+C9zszhyxUiFeare16>$d%B*|a-p7ZD1?%dLhs*6gb=tSE5I%3e_K~kbC$w{`jK#$
zxtW>dQ}B6P8SWn-zw{VZn~guC0Y1O(0U#r5KX!*BIYD2~TfX&v;=`-%mHTh8aNF0p
z@g6KhB3KlKnroNYzGpXqq2Yw6TgZ0iQdL*Wu6>yRE5>R}9FzL&L7VJuyh>qt8HMF#
zNp<OJxrfPYR%6kqK7|}fh*NP*lQ(nDk`R%&ro911{sD~@wZ`#Mg>nD@002ovPDHLk
FV1nwsE%N{X

literal 0
HcmV?d00001

diff --git a/images/icon/light/19x.png b/images/icon/light/19x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ccc3e502e6f341d369e9f7d896a2189346dc6b9
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%A+0*}aI1_o|n5N2eUHAey{7#QFa;_8!G_-9!S4?Ek(d1XK`4pxwnEKE!+
z%uGN=O`y$-nMKWE4i1{~5mwq=QO?toJr`y9U+>LQkr4d3q)J+dcV}f(u7|0SqQuFT
z<Yl>m%Rd@90CjSe1o;Is{Qv*o=hpv^A3_5@uR8@4?eKJQ43W6(+kacES%HT|_<|_o
z&K04z|Np<hHtW_q?sm&JEdspC?|PU8eGNCLRj4yetMp~7*mGkM<IdS}E6#BFEofOB
zDyq{^B~l@nvYKJu%~QfNbQGEdp58gFcB1@(mhRO9Z{pqkv(i{Cr@rFd_J8BqUm*!U
sJ+5z^qg}tx&UN4A>9g<V*P36Je#gQ(-_CimG0;s6p00i_>zopr0B7)fumAu6

literal 0
HcmV?d00001

diff --git a/images/icon/light/32.png b/images/icon/light/32.png
new file mode 100644
index 0000000000000000000000000000000000000000..82519c1f4266adac9d1e272a3d1b4f7e4b72fcc0
GIT binary patch
literal 1217
zcmV;y1U~zTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$V@X6oRCwC7Sba=eRTTfdzLrrwhhjHG
zi;N0mE1_c<#u4KDWYLUdjA@7xw&{{BYNjM6CNs{sITII!zZOkQwwM`|xIiGd=)%^F
z>;pSu&89fS;TRhXVSKiHw7loN*LLaUz4kq9J;}}Eo_l+LzkBYv=bQ^<Sw^rCDIiV$
zznW-{Zy{e>D5ekqh9C&*$>$<zCfbinNrrFQ0~id5M&yMBn359Vo0|R?M-=@;XD7JV
zXy15mrXU<8lo<HqAMb~KcQs-m3v=@jm&L*P`n&k!+h$70XkKYKNrvnUHpBw#kJ7q>
zSY5qcHvqNLcyAxl@@z1g<0H;>9jb%7{tIeVi4YML1n2@gZ@MEcGIFIGJq=B`)7gco
z8v~ddpWwz*vaQJ2xB=Pan~}L`BMhR*jURj10sqV_J%52e0wM;JDdJ8q?mvucU!ROf
zaI&wTH9D`#eFjMnJ;;p<Mh=oEK+K@JC}sS8<*OLJ?ACoWY5BPd@PMVczAhK<{NTuv
zz^PcDdqUSdqt=Akv2k=CYf$JDGc&NRb`R1E*V3y6-{cf?#$lHmeQl><eRfl92n@7$
zK$axlj3hR^&~zNBtFkzKMoBU9YhFUhkpqO3AvOd&gLf3Vgp3smaBfkJ>$oHz5aX0L
z!*gp8{XaTm5~wr@q!-#%^`~pzL`UuWn7Do;b_8hLUM!Xk4%}~Ft<Xz8AAbL;5sk%V
zXn*Z({O!J~3sCa=c>**72E*|3M^`Bs5)Ut}KLjy;S=dFdH=jcDGnHs9uf~A$d_)3S
zo1bD%9K@wjL8glGQw=Ph)6AtNbcgM`_F=03mgX*PFP5Y9(+^dhk%oTH?IC<q^fa-!
z6gUDxBQ7;1EI5@19ClPVo00eOwum8{N^fHe@sT$msT?Uiy4lgY2&5ngfntG$VQblw
zC_8afbB8k{ck%0&Cs=@*9UTihujG>hShK5&)3t7S1w)s*5M;n*Lu!E?e|72hV7kM;
zmLG8Wa6L;vi)DFk4z^!t<8;R#S<ez%FdK5WKv<MIHLnnvpR@IOY&+M26^|7u#>ad9
zWTAX<6kT#M(hR4>+1AzWRUMn3oQ^IK>6LJ?KRzurdID`*YvB5boHMC_!a1eu;AaYb
zvNe+xw^1b{y7=vmPS)IYpCe(Vg%uk2t;uEMb7K>@d8Pw?k5}>A+^UM`v*F-{pSZqv
zXqYvv0)^Iw1$%cypNt02yO!(^skUrZFGLD#>I8z}DKr~8*1~K_*9B}!PD0_n-KaR*
zq*@OKLow&PTv?uA#?Jnq!<OT;+#0>w4e#&>yrfV`B4t@30ZPluAtuj)rKmu2*AdHd
zzjp?`-?hS4xkYJ-f_&DZ5qgs-IDMEXkHBE~g?`TNc?Z9#6rulBg8Bd4Tko-3M1>q_
zkJ=Fw2Og&eE-Z(6E9ifn$}Hu{{)OO1B}kHk;9j}s6d})ZO2SD%eX)L;lMT%i|F}f|
f1rUn)j{pMzdHU{cW0?Q{00000NkvXXu0mjf;H@?X

literal 0
HcmV?d00001

diff --git a/images/icon/light/32w.png b/images/icon/light/32w.png
new file mode 100644
index 0000000000000000000000000000000000000000..28104ad17b48aab44df45135aa6e187ecf7ea2ad
GIT binary patch
literal 1216
zcmV;x1V8(UP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$Vo5|nRCwC7S9?%YRT%&6-Q}_ISSn}(
zL5)>l@j+PWIFglxnwpQHWH6INhn_T3Ofak&!yoxa(=^VgNaEnwkc~|Y4HKz@rW7+I
zlN8yEuM8bvQ9y|2O75fco!Mo$+`D%#?fT7}J!ijj@A-Y_eBb?j-_f{SE|6$68tNWl
zZ3Sz|xDOJd*IymC*-o)xzelH;WI!zIcCseW|8PSj#)e0r5d^<Loel>)7$jPq*6FZ2
z%GvOa$N)hQcCzsd8W-;U4A}*51!UL%j*lZaBm`yK^HKlhS6mkz7u(xs?JkFBw<I2L
z%NP5n1wJ-1f=d^E!(E$AcAmgVN{<}E>m?uZF$0g0b3rNfEsjw|z$?GE;rpZ2XlrVQ
zwfzQ$1_ng)@uoy9dgf`Y$l8b{na@M3)r#hqN5tUn*cc7V=tnnsGTdNL-0A1<7oo1|
zsG@<L*Z<~?o~vuWj7MiCh~~9A5v14v_m?0MI^Kd+FX7@ZEvj8(nm<nhE{CBi#P=2N
znie=o#@f}Yp40hyV6eX*H3ustdSgO7@+`$jc_JNxR>0`s5N=+%#tc1=v$b_twkALZ
zG@opM)9Dl+8{>xZ(?1|#j!C4a;M<g+hoS>}CBgT<4e0H%N^~(Z;w0dcB~-6h?JA!!
z5EL9N(cSLoL{t5VfDn~W1IWj6Qk0d0J#QAE<FD(1Gk|z|sw`N#1W9QNC3^e4d-$%h
z3R%euVaeIX*-(wpdm;mf0X-}@D<w(t0tM5q%5sE+hI(D}^fxugU7Ue8o?C_U4QCV$
zSiXKO4`O0xYQzeq0s}eRbOwp3W;_rcF8d<wuw?VAu->@obC)k}%|S`UKG|R->hJ07
z!Uj_+Kk*3{L_|e-1t&4HSg3Ao#`?Tm=z@Y24LDK#HHuk`IAmN(F8HUfZz4qt9^Y?H
zO-JFzR}>efT=5ZeM}5aN?ATp`sOV_#{Bf!QwTG%C`gd2Z!?vd~;Bs?|C>zoVoEyBY
zI)Z73KYm+_gS*Rk0-7q1nNx85&kG{mvj!tiY@Tc=C}k>NLIIkY{W6ZVwIFTTQptS#
zrOTYkMNvP6A%#GY2?g7BOOfo{2+I+E5z%x`Lrx42J?OsyZ@;jH`?-r%KyotB+lvF1
zQi(op_AJFBM^!SS#eY59$lH-UpCTqMmKPeP1@rm*5c4r*Oxvimlv|g()&FeR+Snw{
zj@EA8d=)5E8*cgFJ^zzY>rX#VJ04~x&E@ri60yk|F!=&8kqsB6<6)yw6>wN&Byx)j
zIb+JzgK`)mBGQM2p>e3kYdL<gxdm6-{=l7Ew^*Ul%|PN|WI%~#GvenYV&38>eePPZ
zET=#^dF(h=Z^@RtnEZGeZ~h2<Np5hd3)mfybMVKn<)NnHaKJ94cDtSTpX9&8zasb5
ztWVAbbT!*SLlLofxhtp^TA!`qa2vuZXqVIBtYE{QsRmF-Mr2ZLazC!;VG$8sqr<~>
e9&nQX1Q-C1UY)f^VG(Ws0000<MNUMnLSTa8ygac0

literal 0
HcmV?d00001

diff --git a/images/icon/light/32x.png b/images/icon/light/32x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cc96ca01b8b20946642382071e4c708d40d7524
GIT binary patch
literal 1222
zcmV;%1UdVOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$Xh}ptRCwB~S8Hq(RTTbacDK8wkA<bR
z?*gGEZnI5G8&FcDS}{tA2`V8XiKIfKCQW>h7*UiTL`(c*2&9zwAfbZsfl3oeYzQ`$
zY7@a)ORNPd#ZqZ0v}~WW`xwu?-K{e_vpZ9Ezs<?)eV%jg{q8yELXso|g-}Q$nMC0x
z`^HkNX46o7oVk(y=gD;n0mTpmp_D$qkXTsRzQBsHsTqi(fN0?J`;la`VsvVnm(8N!
z_4*|j>Fws_U`J9@N2XY87BgzMR-oqbRfq+qJziL8&KK$%(eP6zNVz$4Vd6<@a&f(~
z9q`ddtlwFQ9gnOutYG}^47zXJMnP5z;^Qn4`@ZwVkJ#V%GiX!&KEGrNH9%TG6S$AQ
z5pj~=dk1i=<qx!8>ciEWcQ7(>SJA#aZ4uTvbMee-C)O7(gGm$>?e?k<FgfF4=PxLZ
zfWcxGBd+xIh9(?s?uck$&)^6b*01M44RTZLigvR}sY77^?Skf{Q)Kam+7oEI(r@@^
zTsf&K<+D1JWzooFZ=N_iFXarC#d(JMne{phk58fg%mr0_&f;Y3-c*K?Wf?HhvfOmd
zE)f~qF8AZRU%RnkWqxc7_@Sc*{s2+uwv7}vy|oQ_=?+DGxpN7sD@t&v>IoJ3?%9C;
zkug<WmLo}}Tn@eKI4=&wnN6y?zT2ZX-F`VHj!M@6cE(!R{NdMl`IFPQGB6xF1DM|q
z#hUyq6fH?p)q8w?e0;VY&RvJ`+`(^f;pz=T3fZ_2J_!;NR=7VSMKyqt=}7fPuow{z
zU$u4N!9Abi(R~d#)A@Hq1D-6&=Ohm56$0TGEqk}4AUhR_wm8j!Y=zGrIEmgNx9%#p
zt##q>j!I23GS`27cntZk9-<wW{y&0+3AV7x8A^!@=ilFns)vhUF-4}%@pBhBN3@QV
z9l@=!Nd#}U5J(ufi`+=g<J(<ZbXPbuI)S>T^W>m@<CBHMLGlMLtuIy7RqQ*4bAR<A
z=vhP-m1YHK{_~n4BBdrLVDIK~T(5ft$7`PA5l{=v$WXNR4$h`X0li|RNTmlx&@F2U
z(7wMKWh=5(?Opx1xGPtV5#}F^^uWlrd(&FYHuvOobdJdQZfJ*cN1`oy10H+tGrap{
zGtYp+k@9Uyw?eTr)lSK+ExKUDCTHYiQhTZunTwK;OQG16d*58RW)X8@+M^o#{JNs(
zqhU+eKZ^3d6djr9B`EA>yjJ-@^uZ|903%qD;o$i~B*&(?15!xhF&hojk!DZ8pnF1h
zvgCLxIi3>idHSKSIYFojg#lil+I4O(FXF<|aklLp*9I|gXPh5H&SE>~gEKn?d1(%;
zTAr!9>QEhW1N=lJ@$=S;*jnaN4J=-o&LtYKo5bD(>|vtf09AH!=GL9U5sf7DUJ+dJ
ziywW@ZxLUqEC|Y9MymslQ&H|%!o3xYg1><2=M6+gwt6z4nCd&{I>?^q%!p>{<can3
koL<E<f&Ybao&O0i083%+2TEtVZ~y=R07*qoM6N<$g4E_r$N&HU

literal 0
HcmV?d00001

diff --git a/images/icon/light/38.png b/images/icon/light/38.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d06f23e4678ce1f5123ecc1a9c4f51c63996380
GIT binary patch
literal 1694
zcmV;P24VS$P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00006VoOIv04D(d
z0Q(+QR}ugK010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Rgi*C@}0Y1kC^d1}jNK
zK~z}7#h7_)T*V#7KQr%Guh+YF?2TjRSQ|UB9Vao+AVMh-AyFuxAOsPDQd%LZR3J`O
zrB%a`v<iYM^p7CgimJ3#s&WLO1cZn<q8t$8+=`20H^yd(uf(^#@v-Z-Z~BMhjW_%D
zNU+67^T*E2+xfhi-|>Avlu}G~Km#5ZnpP{M3<GK=yVUhD-JMkj{BkOXQi`ciZs2o3
zA*C`r*$N?M4opgA<aiWPDnMy2a}Qun^5|S_&jL3|)5MNMa2NVnxavl9w;N^KOlK2P
zGCn*)`~F(SgRN*TlV~`y8h8PC4nSNuErbx?0HpvmPyB)vo1S5&n^KB{zx@LZ|9ER+
zK$C6CiY~Ym%mOrDSqb+Y{`j&tP?i-xC?!G&gp?_t9UmUyy_I(oI@1ndE2T6b?kY8a
z+_I9)U~C&}bc|>?OeomKxg*E1#v-x#-0~6(Pd2{N0IvKzG}A<LnF*kVCmV0c{7JCb
zq<-m!X09(S)cE;fdcSI<@!#*#^8Rk3W8swRbIVI9xqS_l53DDzqAX!P%U_T%mH;NS
z)JH$ud5+^-|4ifd9T{KsU~`cA*WSQaR^kXI4Lv;=7i`X{jhyS|vxlFi>&S^K^2ET}
zo0A!724G2=Jw8s|3x7-rrDeI0h5<@pjfLYJBCnzxPw||LUnFC&u4DByzxSczoTqpW
z1vS<9t_t9pTZBDsG1wers3piqR}Z7zy_Bw7ds!!(F<8@%_Z`RGvkO?cZ3_!luXLOr
zXlfz&(H;V~-uxZGgm7Hged524;}t)-J1G=E-l8(Dd8+KPZ8E_Ht@9&}3nN3JB(`VG
zNLEMylcwRg(DZp7$6I#orfu&RL?e+I1~Z(^u4u*bq;YNUqrc(gtAFS0q2q)H24@CL
zMV*yI#RK=Cxw9PS#(MfV_VTM7cyc30U)o0VuH6iM+m?B*b=Xr1A(WWVT`5n-UsKJp
zM;=NW;ZMEsCVL-whPvlpqG9_E22Qu61zWP=K|J${L4XiKX)f2O25bh%udd+1hJ*O8
zU5ZHJnRBkcmS{Lae`6DNDx0!x2AjU&%*T5fYz|_0JdUX-76<1RQS<0Sm_9F^wMUSe
zb}?LNE?4^4lI3E>re8CwvYdv0y+il$`n1oq?>k6;V-x2)I$65mXDQc?_4J`^g^&|c
zXEVUa*)C3Q`x^yIs>oY-Rq~uC1pZ~!6fCJCCom6ClaeK+8tFWE7|+}y3YIQTnE!gm
z2kcsVFP*iAQPC*MR-;peq5>#izmC<fzml=x_BA%qb@U{iwTJ0AP{+vGuH;u%JcoPs
z?INpSR^0fW4Zosg=SP#GQ#i{WDK5*c^Q#t-U$uz9t*hw$s)5!|_S3Na9qh=sV`w?^
z={_p%zdPOobuE3kxYCwg=x4#|m0Y*+DSo(RV^T?dw(i)K#j)?&OrMvkpWn;u<ySi!
zcyHhL12%CrI<8#j6sEh~(+g&ej#2-Ye=^*8F1<rEoTlrTb13l!=1;F4>#0A*i9h|7
zrnh&Jx2TNbn^urtU5T%BL2S)vPap03YdQVaPQv{Ij{j3~$C~K{Yu{f>WN?VS!6Eui
zou>Uj9Y&4^eM<g}Mk0j!29ipoq8pauU$%I9!8#6n8TUKfKaliP9F=aNpC4`AH1SPv
zMK<P;CnH0ljNRPXuI90J`)lMcu1J<n(t|lEQrohq{OS6nvM1?Vn+D4sdzf_}{)fUO
z;Un3edSW8&O<3g0%jJeGzvH@%Pt)<mA=>xV(*M7&8SU=nd~18$he=lcEN1_phQj4F
z1b%!Arq7Gv$xf5JdsBi%0WH+pfo)kxU61=%HN82Q-W<yAx{cD?*I-AZDBF&ETd8XZ
zDUrI4H1v$@$+j#)tsSwSPFL9q5DK<(X!F*T!Bfw6V|sIN<@#{@^JCqWmy7B1qG!7^
zHu6K8w-O4rPL`o!gj3bU7T{T->nO`&R^>wGt-2BS>;k-j`Pk9u^kfB1BXp*X(eB=u
zNl4R}O!_Y>rJlQ3+nRvO0geJnNU5|e*F;HDh?(i2^lY~hnl@RF{St5|)L<{bnZWN6
o;?ztRhGPX{!#D{%era*||6hjQR9y8g82|tP07*qoM6N<$f^VcghX4Qo

literal 0
HcmV?d00001

diff --git a/images/icon/light/38w.png b/images/icon/light/38w.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcc351fabb1c93bdb511b2fb4aedd8fdf12d9b41
GIT binary patch
literal 1772
zcmV<I1{3*-P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00006VoOIv04D(d
z0Q(+QR}ugK010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Rgi*IWIEfDkuN|26;(D
zK~z}7#h86eRreXkKj++Y-+5Dc5fA}EKu}($*xF&WG^TYWYHXHeoh@}~v;Jci(lw1)
zVzYM3rfE&PWLq{jQ#TtIGy9TSbrlf=Ux0x~5u;KNHUXjXQZDy}d(J)kW4-KN?m72@
z!uBNRk8_^iIls?2&-42}&-n=in*fv=42Cr-YO+u98CXD*jFKW5je~Bd>nhL^=nI@!
z0xE%Z2tth2W)o$vcfp_pQN&`kif)%X235^5S<LB*taJdXAI5Kw1IvwOGhUB}#Yu@g
zvZWl0&4$nCn^!1N6mdEnG*zF++1-Q5VrI(i$pkh5H8a810C+tfo`0>1J-_-n3vH^Z
za$rvtCw_P6Kfne<kxx--{5j>feSnaboyCcp?Q@<$k>!w334(wqiec|{O-}Ot!czM0
z^zuy@-<<iy1c0=a*|UQ2`Fwa>E<A2G{oQwHzjOtU+db`HzA_tYl$~W+D~MgP7^B&Y
z$!rb*wc72ZWM=rmgusLkvgo+jh)_<4gIjIweDbIFsXl%p2uRD8ugvE0?G<d>{Q?<z
zxgq{Vi3y=AHY70(;T2-&Za;r~>z90d=<uvV-FLf-qi?@UT6UHum}E3Y22)j4cY?15
z2ig0*U3_u5@qt!i*)v;pb2K8Dp2=P>@BL(NSSYi_f@Cs*s^WIJf)+%^syq@>l4mcz
zvmMyc*v#LL9oO_FrlycnQbbyI7Ky2;$X+jfx4Zb~?Jn*Q-eY8Fm?w5_pIcR!?Z8t<
zk7-_CoS4W@5B-)6Pi@ik_ujlk?Z=-|_RP}{2PO!D=D^P87R~DwFYeNX0!Yuzq4M=t
z=bn=xg6D8(4s?u<>*n4<SO}P8GHDKsiq+P)>f<N4@_9Ahsi_49)6f)v;<638y7tBk
zFL7l5J6yYXnXgAj=LIZKO*aFqC|E`LvpYftE?JtyslOZxsfhq?r<0c23tVfs#6Vvk
zPRAq`n~j)7akGLr_qUJuvZK>~TIUCQ!w&`U?2le1zjSTL&GE@g@wi;H)nC+|V0>hR
z&gK^CKKYdXo;yr_J%QD3BQ8EZELeO>GL2`?F*z{-u-Rxfl^Og{*=tsFW}t^v>%OJC
zG7BGjlqrvg?&~-3dOZ5whR;Xu&092_JWb#2E^JXznx$x32bZPtT-6?;Vq&;@p#f1c
zFb%deJ&heN?G7s$k|eSI$tQ?kn#BFVdko+0j~J%A-922bZ$L7dSp7(;en%?^)So;>
z`{gT$qNq-T4fhXl<iI=R6c&=6yE5zpa!ZQHDJmp6eK~-?WeMAjwANlAaak%k#f2gM
z(?^d{`RGPk>+10-3aYBghHsLs4%n>73W6X|zH>*!FOiU%LdnK&lee~nypm#~Vq+N_
z{tBm#4l1(DjeoTAo#&s!VzUML-rxT=UF{wI)1Rq6U%jODlQ0*{D#$0RAfK{|t=wvB
z=i;d|eDsIInz}Z0x1Wa3&QMXgD_9yNDYA||s4YoKV#8Bgc;(G~R2@8^+frY<c=^Eu
z_F*k5HkKVP@1{T}(MN}e|36^<)f*kBEv_^3>!HEiE*Bph{53<fkcclku5-PyS<{!2
znK8fp*v-~94*z05pZ)m*GV*d*yLl7YYYIrs%KUGbhK6aXKF`S`M;RX((R|LPZ58ti
z)>K`?#Ml@UV`FrE(LwXMT5Qo#L7|!Qco@GwqT3=Bmpw*qNzwd*HP_UJ)J46oqPJ>a
z|INF)-AlwA(<(=f@p0N3E<NyKNXba&z=wY&YjuHcHHiqO)sf1w%(fp^Vzyf61Y|Us
z_`$0`=J$1H!`4ZyIYUA@IuxoiF^d*ab#OngytR*(^A~8WuA!&%1|#=|80hT_`Z0-%
zUqb%+b*x@rN?FBLqT^z*+U;RqKx@uGFclC6di#)N87ZJlh@yx+IvRU)G*5naC!4lc
zAj>kU&lmKz21!B`MI@tf`iS_yD$9W{r)qVu#eijEbPT7%q5J3KpV(wJW42hZ+U?Va
z*=ogPu^<_Z5w{xr_TFoIxpew-|MtX$s;XCJZbOv=8x4|#BFn7EU&Z<@<t$D}ASE*c
zMN#Ibmp2&b@43Us@GwnhYv}I0fzf307yWww#$6zo33w4m7DW-G*@VaC2A!sH9(L`p
z*lc(`9u!4EGD`oFz48%2o(bj;?M4Kl09B3We_)cycu$`4wgOFo*Z&Qnh+7`n(ri!w
O0000<MNUMnLSTZ?t61Iu

literal 0
HcmV?d00001

diff --git a/images/icon/light/38x.png b/images/icon/light/38x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac3d7b3edea779fdda42e88186fc5fb516aead15
GIT binary patch
literal 1680
zcmV;B25<R^P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00006VoOIv04D(d
z0Q(+QR}ugK010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Rgi*G8k#9R_p)(1|3O6
zK~z}7#h80+TUQytfA{HEoQIplX&$6&+=i}Q+HNahV`7DM1GU>UBqnVFHY#l(u?kHH
zrb&abqOnP!GKu{$)J+qj8bTB?s<8@0(ym$8rl?)$@*<>-lcsJ{Cv_dii5=Vb9{yOI
z#r3_mI}-6p=bv-FtMfbOe6RaKt|-7BMV3w|k~9y9l^mKPC*8W*4Sa_J;sV|Wge)P-
zoVt*tm4lKcNt8KtAusIV(3DO<&%&rnz@7u{a;OUP83TWXhaH<X;dW@4La>}7OA_&9
ziq5_uBjFTIO(B^!z6?AM{1`x5q8|j-0Q~U&&-3!5_ps6;gy8$X{X4(uIP<X`Nzz3_
zh^FhoGJq2BS26gj@7?eQ8N<xI6<I<;LYAe1-_9meY<YG+qm$DB=7OE)Jf#8<sPmNs
zW150QDorw-VI&;o<nTq3>CEE#I=_!Hr_Ne`6|2fzI5Y)^s^)=uoH}c2Dzjj+m5l*V
z>2Vf?iYHV2YwQYd9_`^^_h1f?m8`4t@!)Oi`S$kBe73$iZ@sqMlQ)+KrWCpQP$b5S
zZy)E4BRwTQ_3%W5eeZS?sPkEZX{uZttdIjvMB_aA>pydHIP|GJap%^6jg3+q%udo7
zgCD)sQ4q?hspzVLK#)jfavWkqLpAkP-jWYeGT5o}m-xepe#^B6pO-Dobp-0FXz-Pj
zHVlR@M>sbTVImqQ9Gl~7+gfkvhD!!}>v*r_d~Lah{ZH=VzP1+2^`T2wIdo=-om&F`
z8<=Ec`=`%evYdbX?lxN}fY$m|JX3$?joV~?C`el>PABGVZEqzc4@|dkU4ROg!*c%M
zsX_kn(Fmz!2F#<-6va~U3$0ByaczdjUpvGv-Z{YsL*rbVO{@%<VVX9!v>BIf?JJY9
zIrjdkizoO0m7g9w#=-6Zg5hY%5LSCC3-!?p*@^G&xRq@!^?8b`E6YfvG8`Wox7{ET
zPjGtVGKbFmhhR9$Od^Hbp;7I17X({f<)x!H$jrxf{DMPOo>j6?w=~rfdhKa$U%MK~
z#x?I)*T{S(L;uAo<_p-ADFj28ukvosFvAlOyiVOR6=kK-=jG|0?UcJ6bPZlWRpd{?
zg;OgY(ww@=%a7c{hK3qm@BEN|+Jum$($O2Fe|(bht1<R`Wm`ersn{Gs2tZ=-#x7l(
z;g|26psm@@`qis!Kb9nkEo<s%`;4FFno5Ka*^;GTHF9iVj7DEMo16U>!Ml$;o_~{L
zgBLJNfe<8?zL@}c<j##8c<P~&4Y&W|B&UW$bp3mbBYmS>j>c_u8+=|)zw|_&&3)t5
zxA|lDz~b30Bfl(3H{{kE8*A9uSi`Pc1DqYZ!r`8Cyndv|GOmRpGaT+Y$75e?%S}Iu
zTs&NSTJcwuabH^tdmp}=ec!s*_JAK0@ah!-Tg(t{Cr^B7EA4@L>zFq)_x}OQK23$&
zx<q&D>hgjmQfXc}e2P#cR#dldJZu|EZmOwV-g@lA-~=!I<v0hrKBBdL729uaW>Zrw
zE&i%Sop5ZH&c0E8*L9Xi+&X7IaQph@1?%h!5}i#FolVj^9_C2@C|;+I+o3J$%%?M4
zjVG9%vo4YDYHea`bKUZS9qk{@%ZqlmV(qmaUfumwG*wx?3U+!fSulAQlQlIJ9C+#>
zHZ|4SWRnt%Kb^@hK{AHP?(OzvkDchM!Vh+}bMz;V(H>|h@CRlVzp-#^HczR_<6_@8
z@8xF?Z|A*%F*<rj7z|BuWqOvesp*^_lWMPvZ7ubDF3`ZPtpO_CPCQP%-~p`mTnc6Y
z%7v+EGKQIxCS+N{>vG_AIrw_}1|Ga^JsHEq6oRy2<isyolF$?dO_58or;K58;giFe
zIgOMB*$q@)n@ti=rfmOwWLZK}6&#w1Q&;gg^u^)QHJqA?rYb0MX(95N-*@o0v*)vI
zsE~kHu5UxV2t21MG8x0<=7wr^+_ILMayK{CR$`dT)4Wq;iC{R&WNeO(-Vp{uQ|PLa
zP5M92Htv>68E`t=hIDGG0EDzc0}yV9CKOr9_G3>jv|Ftm3D_&az)ClUvqM+pv%sF~
aLH-L)qLdFBeRSdg0000<MNUMnLSTYW11tdm

literal 0
HcmV?d00001

diff --git a/options/index.css b/options/index.css
index a08485a9..fbc0e803 100644
--- a/options/index.css
+++ b/options/index.css
@@ -114,6 +114,14 @@ input[type="color"] {
   height: 2em;
 }
 
+.iconset {
+  display: flex;
+}
+
+.iconset input {
+  display: block;
+}
+
 #actions {
   justify-content: space-around;
   align-items: stretch;
diff --git a/options/index.html b/options/index.html
index 5812ddc3..3a7318be 100644
--- a/options/index.html
+++ b/options/index.html
@@ -13,6 +13,30 @@
 <body>
   <div id="options">
 
+    <div class="block">
+      <h1 i18n-text="optionsCustomizeIcon"></h1>
+      <div class="items">
+        <label>
+          <span i18n-text="optionsIconDark"></span>
+          <div class="iconset">
+            <input type="radio" name="iconset">
+            <img src="/images/icon/16.png">
+            <img src="/images/icon/16w.png">
+            <img src="/images/icon/16x.png">
+          </div>
+        </label>
+        <label>
+          <span i18n-text="optionsIconLight"></span>
+          <div class="iconset">
+            <input type="radio" name="iconset">
+            <img src="/images/icon/light/16.png">
+            <img src="/images/icon/light/16w.png">
+            <img src="/images/icon/light/16x.png">
+          </div>
+        </label>
+      </div>
+    </div>
+
     <div class="block">
       <h1 i18n-text="optionsCustomizeBadge"></h1>
       <div class="items">
diff --git a/options/index.js b/options/index.js
index 3b4dce31..decc038d 100644
--- a/options/index.js
+++ b/options/index.js
@@ -1,6 +1,7 @@
 'use strict';
 
 setupLivePrefs();
+setupRadioButtons();
 enforceInputRange($('#popupWidth'));
 
 // actions
@@ -61,3 +62,26 @@ function checkUpdates() {
     $('#updates-installed').dataset.value = updated || '';
   }
 }
+
+function setupRadioButtons() {
+  const sets = {};
+  const onChange = function() {
+    const newValue = sets[this.name].indexOf(this);
+    if (newValue >= 0 && prefs.get(this.name) != newValue) {
+      prefs.set(this.name, newValue);
+    }
+  };
+  // group all radio-inputs by name="prefName" attribute
+  for (const el of $$('input[type="radio"][name]')) {
+    (sets[el.name] = sets[el.name] || []).push(el);
+    el.addEventListener('change', onChange);
+  }
+  // select the input corresponding to the actual pref value
+  for (const name in sets) {
+    sets[name][prefs.get(name)].checked = true;
+  }
+  // listen to pref changes and update the values
+  prefs.subscribe((key, value) => {
+    sets[key][value].checked = true;
+  }, Object.keys(sets));
+}
diff --git a/prefs.js b/prefs.js
index a84cb52d..c34a0546 100644
--- a/prefs.js
+++ b/prefs.js
@@ -47,6 +47,9 @@ var prefs = new function Prefs() {
     'editor.autocompleteOnTyping': false, // show autocomplete dropdown on typing a word token
     'editor.contextDelete': contextDeleteMissing(), // "Delete" item in context menu
 
+    'iconset': 0,                   // 0 = dark-themed icon
+                                    // 1 = light-themed icon
+
     'badgeDisabled': '#8B0000',     // badge background color when disabled
     'badgeNormal': '#006666',       // badge background color
 
@@ -61,6 +64,7 @@ var prefs = new function Prefs() {
     'disableAll',
     'badgeDisabled',
     'badgeNormal',
+    'iconset',
   ];
 
   const onChange = {

From 877d8b19e0944cc94ab2585dcf545142cbc7e506 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 28 Jun 2017 15:48:13 +0300
Subject: [PATCH 57/94] set default icon (shown before webNavigation API kicks
 in)

---
 background.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/background.js b/background.js
index 7b9daa43..4a9bb27b 100644
--- a/background.js
+++ b/background.js
@@ -47,6 +47,11 @@ if ('commands' in chrome) {
   chrome.commands.onCommand.addListener(command => browserCommands[command]());
 }
 
+// *************************************************************************
+// set the default icon displayed after a tab is created until webNavigation kicks in
+prefs.subscribe(() => updateIcon({id: undefined}, {}), ['iconset']);
+updateIcon({id: undefined}, {});
+
 // *************************************************************************
 {
   const onInstall = ({reason}) => {
@@ -272,7 +277,7 @@ function updateIcon(tab, styles) {
         // TODO: add Edge preferred sizes: 20, 25, 30, 40
       },
     }, () => {
-      if (chrome.runtime.lastError) {
+      if (chrome.runtime.lastError || tab.id === undefined) {
         return;
       }
       // Vivaldi bug workaround: setBadgeText must follow setBadgeBackgroundColor

From 5c1555c781cbb44ca183ec71f0c9aff0035caaa2 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Fri, 30 Jun 2017 15:02:09 +0300
Subject: [PATCH 58/94] code cosmetics: fix some eslint complaints

Until https://github.com/eslint/eslint/issues/8594 is sorted out, we're switching to the old indent behavior (indent-legacy).
---
 .eslintrc              |  2 +-
 apply.js               |  1 -
 background.js          |  1 -
 backup/fileSaveLoad.js |  3 +--
 dom.js                 |  4 +++-
 edit.js                |  2 +-
 install.js             | 29 ++++++++++++++---------------
 7 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 6441aad4..a0e8a12e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -93,7 +93,7 @@ rules:
   id-blacklist: [0]
   id-length: [0]
   id-match: [0]
-  indent: [2, 2, {VariableDeclarator: 0, SwitchCase: 1}]
+  indent-legacy: [2, 2, {VariableDeclarator: 0, SwitchCase: 1}]
   jsx-quotes: [0]
   key-spacing: [0]
   keyword-spacing: [2]
diff --git a/apply.js b/apply.js
index 2d85356a..6e310f05 100644
--- a/apply.js
+++ b/apply.js
@@ -60,7 +60,6 @@ function applyOnMessage(request, sender, sendResponse) {
   }
 
   switch (request.method) {
-
     case 'styleDeleted':
       removeStyle(request);
       break;
diff --git a/background.js b/background.js
index 4a9bb27b..1cfea5f6 100644
--- a/background.js
+++ b/background.js
@@ -292,7 +292,6 @@ function updateIcon(tab, styles) {
 
 function onRuntimeMessage(request, sender, sendResponse) {
   switch (request.method) {
-
     case 'getStyles':
       getStyles(request).then(sendResponse);
       return KEEP_CHANNEL_OPEN;
diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index 4ac993ec..67f6b077 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -378,8 +378,7 @@ Object.assign(document.body, {
       if (event.target === this) {
         this.ondragend();
       }
-    }
-    catch (e) {
+    } catch (e) {
       this.ondragend();
     }
   },
diff --git a/dom.js b/dom.js
index be081107..2dca2090 100644
--- a/dom.js
+++ b/dom.js
@@ -58,7 +58,9 @@ function animateElement(
       element.removeEventListener('animationend', _);
       element.classList.remove(
         className,
-        ...removeExtraClasses // In Firefox, `resolve()` might be called one frame later. This is helpful to clean-up on the same frame
+        // In Firefox, `resolve()` might be called one frame later.
+        // This is helpful to clean-up on the same frame
+        ...removeExtraClasses
       );
       // TODO: investigate why animation restarts if the elements is removed in .then()
       if (remove) {
diff --git a/edit.js b/edit.js
index d84261b0..48ee1bad 100644
--- a/edit.js
+++ b/edit.js
@@ -1,4 +1,4 @@
-/* eslint no-tabs: 0, no-var: 0, indent: [2, tab, {VariableDeclarator: 0, SwitchCase: 1}], quotes: 0 */
+/* eslint no-tabs: 0, no-var: 0, indent-legacy: [2, tab, {VariableDeclarator: 0, SwitchCase: 1}], quotes: 0 */
 /* global CodeMirror */
 "use strict";
 
diff --git a/install.js b/install.js
index f62af69f..7ce385e3 100644
--- a/install.js
+++ b/install.js
@@ -5,13 +5,13 @@ const FIREFOX = /Firefox/.test(navigator.userAgent);
 const VIVALDI = /Vivaldi/.test(navigator.userAgent);
 const OPERA = /OPR/.test(navigator.userAgent);
 
-document.addEventListener("stylishUpdate", onUpdateClicked);
-document.addEventListener("stylishUpdateChrome", onUpdateClicked);
-document.addEventListener("stylishUpdateOpera", onUpdateClicked);
+document.addEventListener('stylishUpdate', onUpdateClicked);
+document.addEventListener('stylishUpdateChrome', onUpdateClicked);
+document.addEventListener('stylishUpdateOpera', onUpdateClicked);
 
-document.addEventListener("stylishInstall", onInstallClicked);
-document.addEventListener("stylishInstallChrome", onInstallClicked);
-document.addEventListener("stylishInstallOpera", onInstallClicked);
+document.addEventListener('stylishInstall', onInstallClicked);
+document.addEventListener('stylishInstallChrome', onInstallClicked);
+document.addEventListener('stylishInstallOpera', onInstallClicked);
 
 chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
   // orphaned content script check
@@ -126,7 +126,7 @@ new MutationObserver((mutations, observer) => {
   US.o does not provide "advanced settings" on this url if browser is not Chrome,
   we need to fix this URL using "stylish-update-url" meta key
 */
-function getStyleURL () {
+function getStyleURL() {
   const url = getMeta('stylish-code-chrome');
   // TODO: remove when USO is fixed
   const directUrl = getMeta('stylish-update-url');
@@ -176,8 +176,7 @@ function checkUpdatability([installedStyle]) {
 function sendEvent(type, detail = null) {
   if (FIREFOX) {
     type = type.replace('Chrome', '');
-  }
-  else if (OPERA || VIVALDI) {
+  } else if (OPERA || VIVALDI) {
     type = type.replace('Chrome', 'Opera');
   }
   detail = {detail};
@@ -336,13 +335,13 @@ function orphanCheck() {
   }
   // we're orphaned due to an extension update
   // we can detach event listeners
-  document.removeEventListener("stylishUpdate", onUpdateClicked);
-  document.removeEventListener("stylishUpdateChrome", onUpdateClicked);
-  document.removeEventListener("stylishUpdateOpera", onUpdateClicked);
+  document.removeEventListener('stylishUpdate', onUpdateClicked);
+  document.removeEventListener('stylishUpdateChrome', onUpdateClicked);
+  document.removeEventListener('stylishUpdateOpera', onUpdateClicked);
 
-  document.removeEventListener("stylishInstall", onInstallClicked);
-  document.removeEventListener("stylishInstallChrome", onInstallClicked);
-  document.removeEventListener("stylishInstallOpera", onInstallClicked);
+  document.removeEventListener('stylishInstall', onInstallClicked);
+  document.removeEventListener('stylishInstallChrome', onInstallClicked);
+  document.removeEventListener('stylishInstallOpera', onInstallClicked);
 
   // we can't detach chrome.runtime.onMessage because it's no longer connected internally
   // we can destroy global functions in this context to free up memory

From 3daeab63cd47c5f42ec31b290ba455583adb4be7 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 9 Jul 2017 13:10:10 +0300
Subject: [PATCH 59/94] Don't submit manifest.version on install since it's
 unused

---
 background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/background.js b/background.js
index 1cfea5f6..72321dfd 100644
--- a/background.js
+++ b/background.js
@@ -61,7 +61,7 @@ updateIcon({id: undefined}, {});
     // Do not display it in development mode.
     if (reason == 'install' && manifest.update_url) {
       setTimeout(openURL, 100, {
-        url: `http://add0n.com/stylus.html?version=${manifest.version}&type=install`
+        url: 'http://add0n.com/stylus.html&type=install'
       });
     }
     // reset L10N cache on UI language change or update

From 7bf958c5aa0dc33c02456e23655814039e83b96d Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 9 Jul 2017 13:13:47 +0300
Subject: [PATCH 60/94] fixup!

---
 background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/background.js b/background.js
index 72321dfd..cc559f8a 100644
--- a/background.js
+++ b/background.js
@@ -61,7 +61,7 @@ updateIcon({id: undefined}, {});
     // Do not display it in development mode.
     if (reason == 'install' && manifest.update_url) {
       setTimeout(openURL, 100, {
-        url: 'http://add0n.com/stylus.html&type=install'
+        url: 'http://add0n.com/stylus.html?type=install'
       });
     }
     // reset L10N cache on UI language change or update

From 6995752fc142221838f08256be1c612d6851339d Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 9 Jul 2017 22:29:54 +0300
Subject: [PATCH 61/94] Don't submit any parameters to homepage on install

---
 background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/background.js b/background.js
index cc559f8a..5adae9e8 100644
--- a/background.js
+++ b/background.js
@@ -61,7 +61,7 @@ updateIcon({id: undefined}, {});
     // Do not display it in development mode.
     if (reason == 'install' && manifest.update_url) {
       setTimeout(openURL, 100, {
-        url: 'http://add0n.com/stylus.html?type=install'
+        url: 'http://add0n.com/stylus.html'
       });
     }
     // reset L10N cache on UI language change or update

From 6502cb51b3b80361ef4b32a88a937a3e6066c00e Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Mon, 10 Jul 2017 17:16:45 +0300
Subject: [PATCH 62/94] remove "." from findStylesForSite message

---
 _locales/ar/messages.json    | 2 +-
 _locales/cs/messages.json    | 2 +-
 _locales/de/messages.json    | 2 +-
 _locales/el/messages.json    | 2 +-
 _locales/en/messages.json    | 2 +-
 _locales/es/messages.json    | 4 ++--
 _locales/fi/messages.json    | 2 +-
 _locales/it/messages.json    | 2 +-
 _locales/nl/messages.json    | 2 +-
 _locales/pt_BR/messages.json | 2 +-
 _locales/ru/messages.json    | 4 ++--
 _locales/sr/messages.json    | 2 +-
 _locales/sv/messages.json    | 2 +-
 _locales/sv_SE/messages.json | 2 +-
 _locales/te/messages.json    | 2 +-
 _locales/tr/messages.json    | 2 +-
 _locales/zh_CN/messages.json | 2 +-
 _locales/zh_TW/messages.json | 2 +-
 18 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index f6ec193f..de22e63c 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "البحث عن المزيد من الأنماط لموقع الويب هذا.",
+		"message": "البحث عن المزيد من الأنماط لموقع الويب هذا",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 2cf3eebe..37e7f72b 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Najít styly pro tento web.",
+		"message": "Najít styly pro tento web",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 9d99a162..80d3833d 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -116,7 +116,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Weitere Styles für diese Webseite finden.",
+		"message": "Weitere Styles für diese Webseite finden",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index 450b7526..3cf88cf3 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Αναζήτηση περισσότερων στυλ για αυτή την ιστοσελίδα.",
+		"message": "Αναζήτηση περισσότερων στυλ για αυτή την ιστοσελίδα",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 4fe186cf..b1f3c3c0 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -238,7 +238,7 @@
     "description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
   },
   "findStylesForSite": {
-    "message": "Find more styles for this site.",
+    "message": "Find more styles for this site",
     "description": "Text for a link that gets a list of styles for the current site"
   },
   "helpAlt": {
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 364fec03..3f700f83 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -116,7 +116,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Encontrar más estilos para este sitio.",
+		"message": "Encontrar más estilos para este sitio",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
@@ -740,4 +740,4 @@
 		"message": "Rediseñe la web con Stylus, un administrador de estilos de usuario. Stylus le permite instalar fácilmente temas y coberturas para muchos sitios populares.",
 		"description": "Extension description"
 	}
-}
\ No newline at end of file
+}
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index 8a4ce03a..dc4dd3c2 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Hae lisää tyylejä tälle sivustolle.",
+		"message": "Hae lisää tyylejä tälle sivustolle",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 3093b539..47ae2455 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Trova più stili per questo sito.",
+		"message": "Trova più stili per questo sito",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index 618b81bd..55174622 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Meer stijlen zoeken voor deze website.",
+		"message": "Meer stijlen zoeken voor deze website",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index 2caebfdc..ce30019c 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Procurar mais estilos para este site.",
+		"message": "Procurar mais estilos para este site",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index f2e9081d..aa32cf48 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -116,7 +116,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Найдите другие стили для этого веб-сайта.",
+		"message": "Найти еще стили для этого веб-сайта",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
@@ -732,4 +732,4 @@
 		"message": "Настраивайте стили веб-сайтов с помощью менеджера стилей Stylus. Он позволяет легко установить темы и изменить внешний вид сайтов Google, Facebook, YouTube, Orkut и множества других веб-страниц.",
 		"description": "Extension description"
 	}
-}
\ No newline at end of file
+}
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index 01682cad..aff25f22 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Пронађи још стилова за овај сајт.",
+		"message": "Пронађи још стилова за овај сајт",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index 4677bf41..16eb3ab7 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Hitta fler stilar för denna sida.",
+		"message": "Hitta fler stilar för denna sida",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/sv_SE/messages.json b/_locales/sv_SE/messages.json
index f726569e..6f48dc3f 100644
--- a/_locales/sv_SE/messages.json
+++ b/_locales/sv_SE/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Hitta fler stilar för denna sida.",
+		"message": "Hitta fler stilar för denna sida",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/te/messages.json b/_locales/te/messages.json
index 7b532ef5..8f64091e 100644
--- a/_locales/te/messages.json
+++ b/_locales/te/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Find more styles for this site.",
+		"message": "Find more styles for this site",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index a0f19961..e47d8a48 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Bu site için başka stiller bul.",
+		"message": "Bu site için başka stiller bul",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index 03265a04..6337a686 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -116,7 +116,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "查找适合此网站的更多样式。",
+		"message": "查找适合此网站的更多样式",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index e326dfc8..c26004be 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -60,7 +60,7 @@
 		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "查找更多適合此網站的樣式。",
+		"message": "查找更多適合此網站的樣式",
 		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {

From af797b894eedab6a0076b597670ff83d0760db2d Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Mon, 10 Jul 2017 17:29:58 +0300
Subject: [PATCH 63/94] replace " - " with ": " in
 updateCheckFailBadResponseCode

---
 _locales/ar/messages.json    | 2 +-
 _locales/cs/messages.json    | 2 +-
 _locales/de/messages.json    | 2 +-
 _locales/el/messages.json    | 2 +-
 _locales/en/messages.json    | 2 +-
 _locales/fi/messages.json    | 2 +-
 _locales/fr/messages.json    | 2 +-
 _locales/it/messages.json    | 2 +-
 _locales/ja/messages.json    | 2 +-
 _locales/nl/messages.json    | 2 +-
 _locales/pt_BR/messages.json | 2 +-
 _locales/ru/messages.json    | 2 +-
 _locales/sr/messages.json    | 2 +-
 _locales/sv/messages.json    | 2 +-
 _locales/sv_SE/messages.json | 2 +-
 _locales/te/messages.json    | 2 +-
 _locales/tr/messages.json    | 2 +-
 _locales/zh/messages.json    | 2 +-
 _locales/zh_CN/messages.json | 2 +-
 _locales/zh_TW/messages.json | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index de22e63c..a0086b79 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "أخفق التحديث - استجاب الخادم بالرمز $code$.",
+		"message": "أخفق التحديث - استجاب الخادم بالرمز $code$",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 37e7f72b..2c00ca63 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Aktualizace selhala - server opověděl kódem $code$.",
+		"message": "Aktualizace selhala: server opověděl kódem $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 80d3833d..4560f6e7 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -432,7 +432,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Aktualisierung fehlgeschlagen - Server hat den Fehler $code$ ausgegeben.",
+		"message": "Aktualisierung fehlgeschlagen: Server hat den Fehler $code$ ausgegeben.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index 3cf88cf3..732d0630 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Αποτυχία ενημέρωσης - ο διακομιστής ανταποκρίθηκε με κωδικό $code$.",
+		"message": "Αποτυχία ενημέρωσης: ο διακομιστής ανταποκρίθηκε με κωδικό $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b1f3c3c0..efb7405b 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -601,7 +601,7 @@
     "description": "Note in the toolbar popup for file:// URLs"
   },
   "updateCheckFailBadResponseCode": {
-    "message": "Update failed - server responded with code $code$.",
+    "message": "Update failed: server responded with code $code$.",
     "description": "Text that displays when an update check failed because the response code indicates an error",
     "placeholders": {
       "code": {
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index dc4dd3c2..d6f4561b 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Päivitys epäonnistui - palvelin vastasi koodilla $code$.",
+		"message": "Päivitys epäonnistui: palvelin vastasi koodilla $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 66621f9b..676a4223 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Échec de la mise à jour. Le serveur a renvoyé le $code$ $code$.",
+		"message": "Échec de la mise à jour: le serveur a renvoyé le code $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 47ae2455..6d5d712f 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Aggiornamento non riuscito - il server ha risposto con il codice $code$.",
+		"message": "Aggiornamento non riuscito: il server ha risposto con il codice $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index e46b5c52..bebef5af 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "更新に失敗しました - サーバーが応答コード「$code$」を返しています。",
+		"message": "更新に失敗しました: サーバーが応答コード「$code$」を返しています。",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index 55174622..fd05af2a 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Update mislukt - server gaf code $code$ als antwoord.",
+		"message": "Update mislukt: server gaf code $code$ als antwoord.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index ce30019c..aa744a88 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "A atualização falhou - o  servidor respondeu com código $code$.",
+		"message": "A atualização falhou: o  servidor respondeu com código $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index aa32cf48..74cae21f 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -432,7 +432,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Ошибка обновления: сервер вернул код \"$code$\".",
+		"message": "Ошибка обновления: сервер вернул код $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index aff25f22..865ad8b0 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Ажурирање није успело - сервер је одговорио кодом $code$.",
+		"message": "Ажурирање није успело: сервер је одговорио кодом $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index 16eb3ab7..67fdce80 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Uppdateringen misslyckades - servern svarade med kod $code$.",
+		"message": "Uppdateringen misslyckades: servern svarade med kod $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/sv_SE/messages.json b/_locales/sv_SE/messages.json
index 6f48dc3f..74c8c4bc 100644
--- a/_locales/sv_SE/messages.json
+++ b/_locales/sv_SE/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Uppdateringen misslyckades - servern svarade med kod $code$.",
+		"message": "Uppdateringen misslyckades: servern svarade med kod $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/te/messages.json b/_locales/te/messages.json
index 8f64091e..50aba760 100644
--- a/_locales/te/messages.json
+++ b/_locales/te/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Update failed - server responded with code $code$.",
+		"message": "Update failed: server responded with code $code$.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index e47d8a48..090a35ed 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Güncellenemedi - sunucu yanıt olarak $code$ kodunu gönderdi.",
+		"message": "Güncellenemedi: sunucu yanıt olarak $code$ kodunu gönderdi.",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/zh/messages.json b/_locales/zh/messages.json
index 49712720..802ba478 100644
--- a/_locales/zh/messages.json
+++ b/_locales/zh/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "更新失败 - 服务器了返回代码 $code$.",
+		"message": "更新失败: 服务器了返回代码 $code$。",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index 6337a686..06767a2b 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -432,7 +432,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "更新失败 - 服务器响应代码为 $code$。",
+		"message": "更新失败: 服务器响应代码为 $code$。",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index c26004be..e6c6616c 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -270,7 +270,7 @@
 		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "更新失敗 – 伺服器傳回代碼 $code$ 。",
+		"message": "更新失敗: 伺服器傳回代碼 $code$。",
 		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {

From 91942814f0a36eaf17b3b7e0033cb3d792b9dd60 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 11 Jul 2017 07:44:26 +0300
Subject: [PATCH 64/94] replace " - " with ": " in
 updateCheckFailServerUnreachable

---
 _locales/cs/messages.json    | 2 +-
 _locales/de/messages.json    | 2 +-
 _locales/el/messages.json    | 2 +-
 _locales/en/messages.json    | 2 +-
 _locales/fi/messages.json    | 2 +-
 _locales/fr/messages.json    | 2 +-
 _locales/it/messages.json    | 2 +-
 _locales/ja/messages.json    | 2 +-
 _locales/nl/messages.json    | 2 +-
 _locales/pt_BR/messages.json | 2 +-
 _locales/sr/messages.json    | 2 +-
 _locales/sv/messages.json    | 2 +-
 _locales/sv_SE/messages.json | 2 +-
 _locales/te/messages.json    | 2 +-
 _locales/tr/messages.json    | 2 +-
 _locales/zh/messages.json    | 2 +-
 _locales/zh_CN/messages.json | 2 +-
 _locales/zh_TW/messages.json | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 2c00ca63..09750610 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aktualizace selhala - server je nedosažitelný.",
+		"message": "Aktualizace selhala: server je nedosažitelný.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 4560f6e7..08ecbe81 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -269,7 +269,7 @@
 		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aktualisierung fehlgeschlagen - Server nicht erreichbar.",
+		"message": "Aktualisierung fehlgeschlagen: Server nicht erreichbar.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index 732d0630..f295cf5d 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Αποτυχία ενημέρωσης - απρόσιτος διακομιστής.",
+		"message": "Αποτυχία ενημέρωσης: απρόσιτος διακομιστής.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index efb7405b..633fb311 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -610,7 +610,7 @@
     }
   },
   "updateCheckFailServerUnreachable": {
-    "message": "Update failed - server unreachable.",
+    "message": "Update failed: server unreachable.",
     "description": "Text that displays when an update check failed because the update server is unreachable"
   },
   "updateCheckSkippedLocallyEdited": {
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index d6f4561b..d13fbe07 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Päivitys epäonnistui - ei voitu yhdistää palvelimeen.",
+		"message": "Päivitys epäonnistui: ei voitu yhdistää palvelimeen.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 676a4223..17a1cec8 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Échec de la mise à jour. Le serveur est inaccessible.",
+		"message": "Échec de la mise à jour: le serveur est inaccessible.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 6d5d712f..87ecf372 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aggiornamento non riuscito - server non raggiungibile.",
+		"message": "Aggiornamento non riuscito: server non raggiungibile.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index bebef5af..72b2571e 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新に失敗しました - サーバーに到達できません。",
+		"message": "更新に失敗しました: サーバーに到達できません。",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index fd05af2a..9bc07767 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Update mislukt - server onbereikbaar.",
+		"message": "Update mislukt: server onbereikbaar.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index aa744a88..d36633c5 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "A atualização falhou - servidor inacessível.",
+		"message": "A atualização falhou: servidor inacessível.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index 865ad8b0..fb77dfe3 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Ажурирање није успело - сервер није доступан.",
+		"message": "Ажурирање није успело: сервер није доступан.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index 67fdce80..59644ffb 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Uppdateringen misslyckades - server onåbar.",
+		"message": "Uppdateringen misslyckades: server onåbar.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/sv_SE/messages.json b/_locales/sv_SE/messages.json
index 74c8c4bc..d097eb36 100644
--- a/_locales/sv_SE/messages.json
+++ b/_locales/sv_SE/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Uppdateringen misslyckades - server onåbar.",
+		"message": "Uppdateringen misslyckades: server onåbar.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/te/messages.json b/_locales/te/messages.json
index 50aba760..4d5db859 100644
--- a/_locales/te/messages.json
+++ b/_locales/te/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Update failed - server unreachable.",
+		"message": "Update failed: server unreachable.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index 090a35ed..771a56ab 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Güncellenemedi - sunucuya erişilemiyor.",
+		"message": "Güncellenemedi: sunucuya erişilemiyor.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/zh/messages.json b/_locales/zh/messages.json
index 802ba478..a99b150c 100644
--- a/_locales/zh/messages.json
+++ b/_locales/zh/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失败 - 服务器无法访问.",
+		"message": "更新失败: 服务器无法访问.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index 06767a2b..9487826b 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -269,7 +269,7 @@
 		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失败 - 无法访问服务器。",
+		"message": "更新失败: 无法访问服务器。",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index e6c6616c..34dfe284 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -149,7 +149,7 @@
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失敗 – 無法訪問伺服器。",
+		"message": "更新失敗: 無法訪問伺服器。",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {

From d2dd4ae1789bf057b043440aae8e2da6cba986a1 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 11 Jul 2017 17:47:57 +0300
Subject: [PATCH 65/94] remove non-translated messages from all locales

---
 _locales/ar/messages.json    | 336 +++-------------------
 _locales/cs/messages.json    | 289 ++++++-------------
 _locales/de/messages.json    | 503 +++++++++++----------------------
 _locales/el/messages.json    | 313 ++++-----------------
 _locales/es/messages.json    | 530 +++++++++++------------------------
 _locales/fi/messages.json    | 332 ++++------------------
 _locales/fr/messages.json    | 319 ++++-----------------
 _locales/it/messages.json    | 337 +++-------------------
 _locales/ja/messages.json    | 336 +++-------------------
 _locales/nl/messages.json    | 291 ++++++-------------
 _locales/pt_BR/messages.json | 336 +++-------------------
 _locales/ru/messages.json    | 523 +++++++++++-----------------------
 _locales/sr/messages.json    | 288 ++++++-------------
 _locales/sv/messages.json    | 313 ++++-----------------
 _locales/sv_SE/messages.json | 313 ++++-----------------
 _locales/te/messages.json    | 388 +------------------------
 _locales/tr/messages.json    | 337 +++-------------------
 _locales/zh/messages.json    | 328 +++-------------------
 _locales/zh_CN/messages.json | 522 +++++++++++-----------------------
 _locales/zh_TW/messages.json | 289 ++++++-------------
 20 files changed, 1594 insertions(+), 5629 deletions(-)

diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index a0086b79..da130415 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -1,208 +1,82 @@
 {
 	"appliesToEverything": {
-		"message": "كل شيء",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "كل شيء"
 	},
 	"enableStyleLabel": {
-		"message": "تمكين",
-		"description": "Label for the button to enable a style"
+		"message": "تمكين"
 	},
 	"styleMissingName": {
-		"message": "أدخل اسمًا.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "أدخل اسمًا."
 	},
 	"appliesDomainOption": {
-		"message": "عناوين URL في النطاق",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "عناوين URL في النطاق"
 	},
 	"checkForUpdate": {
-		"message": "البحث عن تحديث",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "البحث عن تحديث"
 	},
 	"helpAlt": {
-		"message": "مساعدة",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "مساعدة"
 	},
 	"findStylesForSite": {
-		"message": "البحث عن المزيد من الأنماط لموقع الويب هذا",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "البحث عن المزيد من الأنماط لموقع الويب هذا"
 	},
 	"manageHeading": {
-		"message": "الأنماط المثبتة",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "الأنماط المثبتة"
 	},
 	"styleEnabledLabel": {
-		"message": "ممكّن",
-		"description": "Label for the enabled state of styles"
+		"message": "ممكّن"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "يمكن استخدام تنسيق موزيلا للرمز باستخدام Stylus للمتصفح فايرفوكس ويمكن إرساله إلى userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "يمكن استخدام تنسيق موزيلا للرمز باستخدام Stylus للمتصفح فايرفوكس ويمكن إرساله إلى userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "إضافة قسم آخر",
-		"description": "Label for the button to add a section"
+		"message": "إضافة قسم آخر"
 	},
 	"styleSaveLabel": {
-		"message": "حفظ",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "حفظ"
 	},
 	"appliesAdd": {
-		"message": "إضافة",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "إضافة"
 	},
 	"appliesRegexpOption": {
-		"message": "عناوين URL التي تطابق regexp",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "عناوين URL التي تطابق regexp"
 	},
 	"styleInstall": {
 		"message": "هل تريد تثبيت '$stylename$' في Stylus؟",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "تعطيل",
-		"description": "Label for the button to disable a style"
-	},
-	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "تعطيل"
 	},
 	"styleCancelEditLabel": {
-		"message": "رجوع للإدارة",
-		"description": "Label for cancel button for style editing"
+		"message": "رجوع للإدارة"
 	},
 	"styleChangesNotSaved": {
-		"message": "لقد أجريت تغييرات على هذا النمط بدون حفظها.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "لقد أجريت تغييرات على هذا النمط بدون حفظها."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "أخفق التحديث - الخادم يتعذر الوصول إليه.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "أخفق التحديث - الخادم يتعذر الوصول إليه."
 	},
 	"deleteStyleConfirm": {
-		"message": "هل تريد بالتأكيد حذف هذا النمط؟",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "هل تريد بالتأكيد حذف هذا النمط؟"
 	},
 	"appliesDisplay": {
 		"message": "ينطبق على: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
-		"message": "الأقسام",
-		"description": "Title for the style sections section"
+		"message": "الأقسام"
 	},
 	"editStyleTitle": {
 		"message": "تعديل النمط $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +84,31 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "النمط محدّث.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "النمط محدّث."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "عناوين URL البادئة بـ",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "عناوين URL البادئة بـ"
 	},
 	"sectionHelp": {
-		"message": "تتيح لك الأقسام تحديد أجزاء مختلفة من الرمز لتطبيقها على مجموعات مختلفة من عناوين URL بالنمط نفسه. فعلى سبيل المثال، يمكن لنمط مفرد تغيير الصفحة الرئيسية لموقع ويب بطريقة، مع تغيير بقية أجزاء موقع الويب بطريقة أخرى.",
-		"description": "Help text for sections"
+		"message": "تتيح لك الأقسام تحديد أجزاء مختلفة من الرمز لتطبيقها على مجموعات مختلفة من عناوين URL بالنمط نفسه. فعلى سبيل المثال، يمكن لنمط مفرد تغيير الصفحة الرئيسية لموقع ويب بطريقة، مع تغيير بقية أجزاء موقع الويب بطريقة أخرى."
 	},
 	"noStylesForSite": {
-		"message": "لم يتم تثبيت أي أنماط لموقع الويب هذا.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "لم يتم تثبيت أي أنماط لموقع الويب هذا."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "والمزيد",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "والمزيد"
 	},
 	"appliesRemove": {
-		"message": "إزالة",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "إزالة"
 	},
 	"appliesLabel": {
-		"message": "ينطبق على",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "ينطبق على"
 	},
 	"openManage": {
-		"message": "إدارة الأنماط المثبتة",
-		"description": "Link to open the manage page."
+		"message": "إدارة الأنماط المثبتة"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "أخفق التحديث - استجاب الخادم بالرمز $code$",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,135 +116,48 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "تحديد",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "تحديد"
 	},
 	"installUpdate": {
-		"message": "تثبيت التحديث",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "تثبيت التحديث"
 	},
 	"sectionRemove": {
-		"message": "إزالة القسم",
-		"description": "Label for the button to remove a section"
-	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "إزالة القسم"
 	},
 	"updateCompleted": {
-		"message": "اكتمل التحديث.",
-		"description": "Text that displays when an update completed"
+		"message": "اكتمل التحديث."
 	},
 	"checkingForUpdate": {
-		"message": "جارٍ البحث...",
-		"description": "Text to display when checking a style for an update"
+		"message": "جارٍ البحث..."
 	},
 	"sectionCode": {
-		"message": "الرمز",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "الرمز"
 	},
 	"appliesHelp": {
-		"message": "استخدم عناصر تحكم 'ينطبق على' لتقييد عناوين URL التي ينطبق عليها الرمز في هذا القسم.",
-		"description": "Help text for 'applies to' section"
+		"message": "استخدم عناصر تحكم 'ينطبق على' لتقييد عناوين URL التي ينطبق عليها الرمز في هذا القسم."
 	},
 	"editStyleHeading": {
-		"message": "تعديل النمط",
-		"description": "Title of the page for editing styles"
+		"message": "تعديل النمط"
 	},
 	"appliesUrlOption": {
-		"message": "عنوان URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "عنوان URL"
 	},
 	"addStyleTitle": {
-		"message": "إضافة نمط",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "إضافة نمط"
 	},
 	"checkAllUpdates": {
-		"message": "البحث عن تحديثات لكل الأنماط",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "البحث عن تحديثات لكل الأنماط"
 	},
 	"deleteStyleLabel": {
-		"message": "حذف",
-		"description": "Label for the button to delete a style"
+		"message": "حذف"
 	},
 	"addStyleLabel": {
-		"message": "كتابة نمط جديد",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "كتابة نمط جديد"
 	},
 	"editStyleLabel": {
-		"message": "تعديل",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "تعديل"
 	},
 	"description": {
-		"message": "يمكنك تغيير نمط الويب باستخدام Stylus، وهي أداة لإدارة أنماط المستخدم. وتتيح Stylus لك بسهولة تثبيت المظاهر والأشكال الخارجية لكل من Google، وFacebook وYouTube وOrkut فضلاً عن الكثير جدًا من مواقع الويب الأخرى.",
-		"description": "Extension description"
+		"message": "يمكنك تغيير نمط الويب باستخدام Stylus، وهي أداة لإدارة أنماط المستخدم. وتتيح Stylus لك بسهولة تثبيت المظاهر والأشكال الخارجية لكل من Google، وFacebook وYouTube وOrkut فضلاً عن الكثير جدًا من مواقع الويب الأخرى."
 	}
 }
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 09750610..064ed161 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -1,111 +1,84 @@
 {
 	"appliesToEverything": {
-		"message": "Vše",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "Vše"
 	},
 	"defaultTheme": {
-		"message": "výchozí",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "výchozí"
 	},
 	"exportLabel": {
-		"message": "Exportovat",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+		"message": "Exportovat"
 	},
 	"issues": {
-		"message": "Problémy",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Problémy"
 	},
 	"cm_tabSize": {
-		"message": "Velikost tabulátorů",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Velikost tabulátorů"
 	},
 	"enableStyleLabel": {
-		"message": "Povolit",
-		"description": "Label for the button to enable a style"
+		"message": "Povolit"
 	},
 	"styleMissingName": {
-		"message": "Zadejte název.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Zadejte název."
 	},
 	"appliesDomainOption": {
-		"message": "URL adresy na doméně",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL adresy na doméně"
 	},
 	"checkForUpdate": {
-		"message": "Zkontrolovat aktualizace",
-		"description": "Label for the button to check a single style for an update"
+		"message": "Zkontrolovat aktualizace"
 	},
 	"importAppendLabel": {
-		"message": "Připojit ke stylu",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Připojit ke stylu"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Všechny styly jsou aktuální.",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "Všechny styly jsou aktuální."
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Vložit kód v Mozilla-formátu",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Vložit kód v Mozilla-formátu"
 	},
 	"helpAlt": {
-		"message": "Nápověda",
-		"description": "Alternate text for help buttons"
+		"message": "Nápověda"
 	},
 	"search": {
-		"message": "Vyhledat",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "Vyhledat"
 	},
 	"confirmYes": {
-		"message": "Ano",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Ano"
 	},
 	"findStylesForSite": {
-		"message": "Najít styly pro tento web",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Najít styly pro tento web"
 	},
 	"manageHeading": {
-		"message": "Nainstalované Styly",
-		"description": "Heading for the manage page"
+		"message": "Nainstalované Styly"
 	},
 	"styleBeautify": {
-		"message": "Zkrášlit",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Zkrášlit"
 	},
 	"styleEnabledLabel": {
-		"message": "Povolen",
-		"description": "Label for the enabled state of styles"
+		"message": "Povolen"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla formát umožní použití stylu v prohlížeči Mozilla Firefox a jeho odeslání na userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Mozilla formát umožní použití stylu v prohlížeči Mozilla Firefox a jeho odeslání na userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Přidat další sekci",
-		"description": "Label for the button to add a section"
+		"message": "Přidat další sekci"
 	},
 	"styleSaveLabel": {
-		"message": "Uložit",
-		"description": "Label for save button for style editing"
+		"message": "Uložit"
 	},
 	"confirmStop": {
-		"message": "Zastavit",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Zastavit"
 	},
 	"writeStyleForURL": {
-		"message": "tato URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "tato URL"
 	},
 	"appliesAdd": {
-		"message": "Přidat",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Přidat"
 	},
 	"appliesRegexpOption": {
-		"message": "URL adresy odpovídající reg. výrazu",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URL adresy odpovídající reg. výrazu"
 	},
 	"styleInstall": {
 		"message": "Nainstalovat '$stylename$' do Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -113,74 +86,52 @@
 		}
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Získat styly na userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Získat pomoc</a>",
-		"description": "Help text on the manage page"
+		"message": "<a href='https://userstyles.org'>Získat styly na userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Získat pomoc</a>"
 	},
 	"searchStyles": {
-		"message": "Prohledat obsah",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "Prohledat obsah"
 	},
 	"disableStyleLabel": {
-		"message": "Zakázat",
-		"description": "Label for the button to disable a style"
+		"message": "Zakázat"
 	},
 	"prefShowBadge": {
-		"message": "Zobrazit počet aktivních stylů pro současnou stránku u tlačítka v panelu nástrojů",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Zobrazit počet aktivních stylů pro současnou stránku u tlačítka v panelu nástrojů"
 	},
 	"menuShowBadge": {
-		"message": "Zobrazit počet aktivních stylů",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Zobrazit počet aktivních stylů"
 	},
 	"cm_lineWrapping": {
-		"message": "Zalamování slov",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Zalamování slov"
 	},
 	"styleCancelEditLabel": {
-		"message": "Zpět ke správě",
-		"description": "Label for cancel button for style editing"
+		"message": "Zpět ke správě"
 	},
 	"styleChangesNotSaved": {
-		"message": "Provedli jste změny tohoto stylu bez uložení.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+		"message": "Provedli jste změny tohoto stylu bez uložení."
 	},
 	"importLabel": {
-		"message": "Importovat",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Importovat"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aktualizace selhala: server je nedosažitelný.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Aktualizace selhala: server je nedosažitelný."
 	},
 	"manageFilters": {
-		"message": "Filtry",
-		"description": "Label for filters container"
+		"message": "Filtry"
 	},
 	"applyAllUpdates": {
-		"message": "Použít všechny aktualizace",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Použít všechny aktualizace"
 	},
 	"deleteStyleConfirm": {
-		"message": "Opravdu chcete tento styl smazat?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "Opravdu chcete tento styl smazat?"
 	},
 	"styleBadRegexp": {
-		"message": "Tento regulérní výraz je neplatný.",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "Tento regulérní výraz je neplatný."
 	},
 	"optionsHeading": {
-		"message": "Možnosti",
-		"description": "Heading for options section on manage page."
+		"message": "Možnosti"
 	},
 	"appliesDisplay": {
 		"message": "Platí pro: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,7 +140,6 @@
 	},
 	"styleUpdate": {
 		"message": "Určitě chcete aktualizovat '$stylename$'?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -197,12 +147,10 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Sekce",
-		"description": "Title for the style sections section"
+		"message": "Sekce"
 	},
 	"editStyleTitle": {
 		"message": "Upravit Styl $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +158,49 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Styl je aktuální.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Styl je aktuální."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL adresy začínající",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
+		"message": "URL adresy začínající"
 	},
 	"searchRegexp": {
-		"message": "Použít /re/ syntaxi pro vyhledávání s regulérními výrazy",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
+		"message": "Použít /re/ syntaxi pro vyhledávání s regulérními výrazy"
 	},
 	"importReplaceTooltip": {
-		"message": "Zahodit obsah současného stylu a přepsat ho importovaným stylem",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Zahodit obsah současného stylu a přepsat ho importovaným stylem"
 	},
 	"popupStylesFirst": {
-		"message": "Vypsat styly před příkazy v menu pod tlačítkem na panelu nástrojů",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "Vypsat styly před příkazy v menu pod tlačítkem na panelu nástrojů"
 	},
 	"sectionHelp": {
-		"message": "Pomocí sekcí můžete v jednom stylu nadefinovat více částí kódu pro různé skupiny URL adres. Jeden styl pak může např. změnit hlavní stránku webu jinak, než jeho zbytek.",
-		"description": "Help text for sections"
+		"message": "Pomocí sekcí můžete v jednom stylu nadefinovat více částí kódu pro různé skupiny URL adres. Jeden styl pak může např. změnit hlavní stránku webu jinak, než jeho zbytek."
 	},
 	"noStylesForSite": {
-		"message": "Pro tento web není nainstalován žádný styl.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Pro tento web není nainstalován žádný styl."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "a další",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "a další"
 	},
 	"appliesRemove": {
-		"message": "Odstranit",
-		"description": "Label for the button to remove an 'applies' entry"
+		"message": "Odstranit"
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Styl v Mozilla formátu",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Styl v Mozilla formátu"
 	},
 	"writeStyleFor": {
-		"message": "Napsat nový styl",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+		"message": "Napsat nový styl"
 	},
 	"replace": {
-		"message": "Nahradit",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Nahradit"
 	},
 	"appliesLabel": {
-		"message": "Platí pro",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Platí pro"
 	},
 	"openManage": {
-		"message": "Spravovat nainstalovné styly",
-		"description": "Link to open the manage page."
+		"message": "Spravovat nainstalovné styly"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Aktualizace selhala: server opověděl kódem $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,143 +208,105 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specifikovat",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Specifikovat"
 	},
 	"installUpdate": {
-		"message": "Nainstalovat aktualizaci",
-		"description": "Label for the button to install an update for a single style"
+		"message": "Nainstalovat aktualizaci"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla Formát",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Mozilla Formát"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus nefunguje na těchto stránkách.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus nefunguje na těchto stránkách."
 	},
 	"sectionRemove": {
-		"message": "Odstranit sekci",
-		"description": "Label for the button to remove a section"
+		"message": "Odstranit sekci"
 	},
 	"disableAllStyles": {
-		"message": "Vypnout všechny styly.",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Vypnout všechny styly."
 	},
 	"undoGlobal": {
-		"message": "Zpět (globálně)",
-		"description": "CSS-beautify global Undo button label"
+		"message": "Zpět (globálně)"
 	},
 	"updateCompleted": {
-		"message": "Aktalizace dokončena.",
-		"description": "Text that displays when an update completed"
+		"message": "Aktalizace dokončena."
 	},
 	"checkingForUpdate": {
-		"message": "Kontroluji...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Kontroluji..."
 	},
 	"sectionCode": {
-		"message": "Kód",
-		"description": "Label for the code for a section"
+		"message": "Kód"
 	},
 	"cm_smartIndent": {
-		"message": "Použít chytré odsazení",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Použít chytré odsazení"
 	},
 	"appliesHelp": {
-		"message": "Nastavte 'Platí pro', pokud chcete limitovat, na které URL adresy se použije kód v této sekci.",
-		"description": "Help text for 'applies to' section"
+		"message": "Nastavte 'Platí pro', pokud chcete limitovat, na které URL adresy se použije kód v této sekci."
 	},
 	"editStyleHeading": {
-		"message": "Upravit Styl",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Upravit Styl"
 	},
 	"addStyleTitle": {
-		"message": "Přidat Styl",
-		"description": "Title of the page for adding styles"
+		"message": "Přidat Styl"
 	},
 	"importReplaceLabel": {
-		"message": "Přepsat styl",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Přepsat styl"
 	},
 	"dbError": {
-		"message": "Nastala chyba při používání Stylus databáze. Chcete navštívit webovou stránku s možnými řešeními?",
-		"description": "Prompt when a DB error is encountered"
+		"message": "Nastala chyba při používání Stylus databáze. Chcete navštívit webovou stránku s možnými řešeními?"
 	},
 	"importAppendTooltip": {
-		"message": "Připojit importovaný styl k současnému stylu",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
+		"message": "Připojit importovaný styl k současnému stylu"
 	},
 	"helpKeyMapHotkey": {
-		"message": "Stiskněte kláves. zkratku",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Stiskněte kláves. zkratku"
 	},
 	"replaceAll": {
-		"message": "Nahradit vše",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Nahradit vše"
 	},
 	"editGotoLine": {
-		"message": "Přejít na řádek (nebo na line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Přejít na řádek (nebo na line:col)"
 	},
 	"checkAllUpdates": {
-		"message": "Aktualizovat všechny styly",
-		"description": "Label for the button to check all styles for updates"
+		"message": "Aktualizovat všechny styly"
 	},
 	"issuesHelp": {
-		"message": "Problémy nalezené aplikací <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> s těmito povolenými pravidly:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "Problémy nalezené aplikací <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> s těmito povolenými pravidly:"
 	},
 	"confirmNo": {
-		"message": "Ne",
-		"description": "'No' button in a confirm dialog"
+		"message": "Ne"
 	},
 	"undo": {
-		"message": "Zpět",
-		"description": "Button label"
+		"message": "Zpět"
 	},
 	"cm_keyMap": {
-		"message": "Přiřazení kláves",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Přiřazení kláves"
 	},
 	"cm_indentWithTabs": {
-		"message": "Použít tabulátory s chytrým odsazením",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+		"message": "Použít tabulátory s chytrým odsazením"
 	},
 	"replaceWith": {
-		"message": "Nahradit s",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Nahradit s"
 	},
 	"deleteStyleLabel": {
-		"message": "Smazat",
-		"description": "Label for the button to delete a style"
+		"message": "Smazat"
 	},
 	"addStyleLabel": {
-		"message": "Napsat nový styl",
-		"description": "Label for the button to go to the add style page"
+		"message": "Napsat nový styl"
 	},
 	"manageOnlyEnabled": {
-		"message": "Pouze povolené styly",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Pouze povolené styly"
 	},
 	"editStyleLabel": {
-		"message": "Upravit",
-		"description": "Label for the button to go to the edit style page"
+		"message": "Upravit"
 	},
 	"cm_theme": {
-		"message": "Schéma",
-		"description": "Label for the style editor's CSS theme."
+		"message": "Schéma"
 	},
 	"helpKeyMapCommand": {
-		"message": "Napište název příkazu",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Napište název příkazu"
 	},
 	"description": {
-		"message": "Přestylujte web pomocí Stylus, manažeru uživatelských stylů. Stylus vám umožní nainstalovat témata a skiny pro mnoho populárních webů.",
-		"description": "Extension description"
+		"message": "Přestylujte web pomocí Stylus, manažeru uživatelských stylů. Stylus vám umožní nainstalovat témata a skiny pro mnoho populárních webů."
 	}
 }
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 08ecbe81..62791cfc 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -1,199 +1,150 @@
 {
 	"appliesToEverything": {
-		"message": "Alles",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "Alles"
 	},
 	"defaultTheme": {
-		"message": "Standard",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "Standard"
 	},
 	"styleRegexpTestTitle": {
-		"message": "Liste der zutreffenden, geöffneten Tabs (URL anklicken um den Tab zu fokussieren)",
-		"description": "RegExp test report: title of the report"
+		"message": "Liste der zutreffenden, geöffneten Tabs (URL anklicken um den Tab zu fokussieren)"
 	},
 	"bckpInstStyles": {
-		"message": "Styles Exportieren",
-		"description": ""
+		"message": "Styles Exportieren"
 	},
 	"optionsUpdateInterval": {
-		"message": "Automatischer Update- und Installations-Intervall (in Stunden)",
-		"description": ""
+		"message": "Automatischer Update- und Installations-Intervall (in Stunden)"
 	},
 	"exportLabel": {
-		"message": "Exportieren",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+		"message": "Exportieren"
 	},
 	"issues": {
-		"message": "Probleme",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Probleme"
 	},
 	"optionsBadgeNormal": {
-		"message": "Hintergrundfarbe",
-		"description": ""
+		"message": "Hintergrundfarbe"
 	},
 	"updateCheckHistory": {
-		"message": "Verlauf der Aktualisierungs-Überprüfungen",
-		"description": ""
+		"message": "Verlauf der Aktualisierungs-Überprüfungen"
 	},
 	"cm_tabSize": {
-		"message": "Tab-Größe",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Tab-Größe"
 	},
 	"enableStyleLabel": {
-		"message": "Aktivieren",
-		"description": "Label for the button to enable a style"
+		"message": "Aktivieren"
 	},
 	"styleMissingName": {
-		"message": "Bitte einen Namen eingeben.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Bitte einen Namen eingeben."
 	},
 	"genericHistoryLabel": {
-		"message": "Verlauf",
-		"description": "Used in various places to show a history log of something"
+		"message": "Verlauf"
 	},
 	"shortcutsNote": {
-		"message": "Eine Tastenkombination definieren",
-		"description": ""
+		"message": "Eine Tastenkombination definieren"
 	},
 	"appliesDomainOption": {
-		"message": "URLs auf der Domain",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URLs auf der Domain"
 	},
 	"checkForUpdate": {
-		"message": "Nach Aktualisierungen suchen",
-		"description": "Label for the button to check a single style for an update"
+		"message": "Nach Aktualisierungen suchen"
 	},
 	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style wurde aufgrund der nicht gültigen Verwendung der Regulären Ausdrücke 'regexp()' nicht angewandt.",
-		"description": "Tooltip in the popup for styles that were not applied at all"
+		"message": "Style wurde aufgrund der nicht gültigen Verwendung der Regulären Ausdrücke 'regexp()' nicht angewandt."
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "Einige Regeln der Regulären Ausdrücke 'regexp()' konnten nicht überprüft werden.",
-		"description": ""
+		"message": "Einige Regeln der Regulären Ausdrücke 'regexp()' konnten nicht überprüft werden."
 	},
 	"importAppendLabel": {
-		"message": "Zum Style anfügen",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Zum Style anfügen"
 	},
 	"optionsOpenManager": {
-		"message": "Verwaltung",
-		"description": ""
+		"message": "Verwaltung"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Keine Aktualisierung gefunden",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "Keine Aktualisierung gefunden"
 	},
 	"importReportLegendAdded": {
-		"message": "Hinzugefügt",
-		"description": "Text after the number of styles added in the report shown after importing styles"
+		"message": "Hinzugefügt"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Mozilla Format Code einfügen",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Mozilla Format Code einfügen"
 	},
 	"dragDropMessage": {
-		"message": "Ziehe die Backup Datei zum importieren an irgendeinen Ort auf dieser Seite.",
-		"description": "Drag'n'drop message"
+		"message": "Ziehe die Backup Datei zum importieren an irgendeinen Ort auf dieser Seite."
 	},
 	"helpAlt": {
-		"message": "Hilfe",
-		"description": "Alternate text for help buttons"
+		"message": "Hilfe"
 	},
 	"confirmOK": {
 		"message": "OK",
-		"description": ""
 	},
 	"search": {
-		"message": "Suche",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "Suche"
 	},
 	"manageFaviconsGray": {
-		"message": "Ausgegraut",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+		"message": "Ausgegraut"
 	},
 	"confirmYes": {
-		"message": "Ja",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Ja"
 	},
 	"findStylesForSite": {
-		"message": "Weitere Styles für diese Webseite finden",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Weitere Styles für diese Webseite finden"
 	},
 	"manageHeading": {
-		"message": "Installierte Styles",
-		"description": "Heading for the manage page"
+		"message": "Installierte Styles"
 	},
 	"styleBeautify": {
 		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
 	},
 	"styleRegexpProblemTooltip": {
-		"message": "Anzahl der Bereiche wurde nicht angewendet aufgrund von nicht korrekten Verwendeten Regulären Ausdrücken 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
+		"message": "Anzahl der Bereiche wurde nicht angewendet aufgrund von nicht korrekten Verwendeten Regulären Ausdrücken 'regexp()'"
 	},
 	"styleEnabledLabel": {
-		"message": "Aktiviert",
-		"description": "Label for the enabled state of styles"
+		"message": "Aktiviert"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Das Mozilla-Format des Codes kann mit Stylish für Firefox verwendet werden und bei userstyles.org eingereicht werden.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Das Mozilla-Format des Codes kann mit Stylish für Firefox verwendet werden und bei userstyles.org eingereicht werden."
 	},
 	"sectionAdd": {
-		"message": "Weiteren Bereich hinzufügen",
-		"description": "Label for the button to add a section"
+		"message": "Weiteren Bereich hinzufügen"
 	},
 	"styleRegexpTestPartial": {
-		"message": "Kein genau Übereinstimmung, wurden daher übersprungen.",
-		"description": "RegExp test report: label for the partially matching expressions"
+		"message": "Kein genau Übereinstimmung, wurden daher übersprungen."
 	},
 	"styleSaveLabel": {
-		"message": "Speichern",
-		"description": "Label for save button for style editing"
+		"message": "Speichern"
 	},
 	"confirmDelete": {
-		"message": "Löschen",
-		"description": ""
+		"message": "Löschen"
 	},
 	"confirmCancel": {
-		"message": "Abbrechen",
-		"description": ""
+		"message": "Abbrechen"
 	},
 	"retrieveBckp": {
-		"message": "Styles Importieren",
-		"description": ""
+		"message": "Styles Importieren"
 	},
 	"confirmStop": {
-		"message": "Stopp",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Stopp"
 	},
 	"writeStyleForURL": {
-		"message": "diese URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "diese URL"
 	},
 	"optionsSubheading": {
-		"message": "Mehr Optionen",
-		"description": "Subheading for options section on manage page."
+		"message": "Mehr Optionen"
 	},
 	"appliesAdd": {
-		"message": "Hinzufügen",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Hinzufügen"
 	},
 	"appliesRegexpOption": {
-		"message": "URLs, die mit dem Regulären Ausdrücken übereinstimmen",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URLs, die mit dem Regulären Ausdrücken übereinstimmen"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "Aktiviert die Iframe-spezifische CSS Auszeichnung wie 'html[stylus-iframe] h1 { display:none; }'",
-		"description": ""
+		"message": "Aktiviert die Iframe-spezifische CSS Auszeichnung wie 'html[stylus-iframe] h1 { display:none; }'"
 	},
 	"importReportLegendUpdatedCode": {
-		"message": "Aktualisierter Code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
+		"message": "Aktualisierter Code"
 	},
 	"styleInstall": {
 		"message": "\"$stylename$\" in Stylus installieren?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -201,112 +152,85 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "Hintergrundfarbe wenn deaktiviert.",
-		"description": ""
+		"message": "Hintergrundfarbe wenn deaktiviert."
 	},
 	"optionsCheck": {
-		"message": "Styles aktualisieren",
-		"description": ""
+		"message": "Styles aktualisieren"
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Styles von userstyles.org beziehen</a> | <a href='http://add0n.com/stylus.html'>Hilfeseite anzeigen</a>",
-		"description": "Help text on the manage page"
+		"message": "<a href='https://userstyles.org'>Styles von userstyles.org beziehen</a> | <a href='http://add0n.com/stylus.html'>Hilfeseite anzeigen</a>"
 	},
 	"manageOnlyLocal": {
-		"message": "Nur Locale Styles anzeigen",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+		"message": "Nur Locale Styles anzeigen"
 	},
 	"searchStyles": {
-		"message": "Inhalte durchsuchen",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "Inhalte durchsuchen"
 	},
 	"optionsUpdateImportNote": {
-		"message": "Nach dem Importieren alter Backups oder aus Stylish ist eine einmalige manuelle Überprüfung der Aktualisierungen (Updates) in der Verwaltung nötig. Dies stellt sicher das alle Styles auf dem aktuellsten Stand sind.",
-		"description": ""
+		"message": "Nach dem Importieren alter Backups oder aus Stylish ist eine einmalige manuelle Überprüfung der Aktualisierungen (Updates) in der Verwaltung nötig. Dies stellt sicher das alle Styles auf dem aktuellsten Stand sind."
 	},
 	"checkAllUpdatesForce": {
-		"message": "Nochmals überprüfen, ich habe keine Styles bearbeitet!",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Nochmals überprüfen, ich habe keine Styles bearbeitet!"
 	},
 	"unreachableFileHint": {
-		"message": "Stylus kann nur auf das file:// Protokoll in der URL zugreifen wenn dies in den Einstellungen der Erweiterung festgelegt ist.",
-		"description": "Note in the toolbar popup for file:// URLs"
+		"message": "Stylus kann nur auf das file:// Protokoll in der URL zugreifen wenn dies in den Einstellungen der Erweiterung festgelegt ist."
 	},
 	"disableStyleLabel": {
-		"message": "Deaktivieren",
-		"description": "Label for the button to disable a style"
+		"message": "Deaktivieren"
 	},
 	"prefShowBadge": {
-		"message": "Anzahl der aktiven Styles auf der aktuellen Seiten",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Anzahl der aktiven Styles auf der aktuellen Seiten"
 	},
 	"manageFavicons": {
-		"message": "Favicons in der 'Gilt für' Spalte anzeigen",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+		"message": "Favicons in der 'Gilt für' Spalte anzeigen"
 	},
 	"menuShowBadge": {
-		"message": "Zählung der aktiven Styles anzeigen ",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Zählung der aktiven Styles anzeigen "
 	},
 	"cm_lineWrapping": {
-		"message": "Automatischer Zeilenumbruch",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Automatischer Zeilenumbruch"
 	},
 	"styleCancelEditLabel": {
-		"message": "Zurück zum Verwalten",
-		"description": "Label for cancel button for style editing"
+		"message": "Zurück zum Verwalten"
 	},
 	"styleChangesNotSaved": {
-		"message": "Sie haben Änderungen an diesem Style vorgenommen, ohne diese zu speichern.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+		"message": "Sie haben Änderungen an diesem Style vorgenommen, ohne diese zu speichern."
 	},
 	"importLabel": {
-		"message": "Importieren",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Importieren"
 	},
 	"shortcuts": {
-		"message": "Tastenkürzel",
-		"description": "Go to shortcut configuration"
+		"message": "Tastenkürzel"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aktualisierung fehlgeschlagen: Server nicht erreichbar.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Aktualisierung fehlgeschlagen: Server nicht erreichbar."
 	},
 	"manageFilters": {
-		"message": "Filter",
-		"description": "Label for filters container"
+		"message": "Filter"
 	},
 	"applyAllUpdates": {
-		"message": "Alle Updates übernehmen ",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Alle Updates übernehmen "
 	},
 	"optionsReset": {
-		"message": "Setzt diese Einstellungen auf die Standard-Werte zurück.",
-		"description": ""
+		"message": "Setzt diese Einstellungen auf die Standard-Werte zurück."
 	},
 	"optionsCustomizeUpdate": {
 		"message": "Updates",
-		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Möchten Sie diesen Style wirklich löschen?",
-		"description": "Confirmation before deleting a style"
+		"message": "Möchten Sie diesen Style wirklich löschen?"
 	},
 	"optionsCustomizePopup": {
 		"message": "Popup",
-		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Regulärer Ausdruck ist ungültig.",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "Regulärer Ausdruck ist ungültig."
 	},
 	"optionsHeading": {
-		"message": "Optionen",
-		"description": "Heading for options section on manage page."
+		"message": "Optionen"
 	},
 	"appliesDisplay": {
 		"message": "Gilt für: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -314,12 +238,10 @@
 		}
 	},
 	"openStylesManager": {
-		"message": "Style Verwaltung öffnen",
-		"description": "Label for the style maanger opener in the browser action context menu."
+		"message": "Style Verwaltung öffnen"
 	},
 	"styleUpdate": {
 		"message": "Möchten Sie '$stylename$' wirklich aktualisieren?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -327,16 +249,13 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Bereiche",
-		"description": "Title for the style sections section"
+		"message": "Bereiche"
 	},
 	"importReportLegendInvalid": {
-		"message": "Ungültige übersprungen",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
+		"message": "Ungültige übersprungen"
 	},
 	"editStyleTitle": {
 		"message": "Style $stylename$ bearbeiten",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -344,96 +263,73 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Der Style ist auf dem aktuellsten Stand.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Der Style ist auf dem aktuellsten Stand."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URLs beginnend mit",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
+		"message": "URLs beginnend mit"
 	},
 	"cm_matchHighlightToken": {
-		"message": "Auszeichnung unter dem Textzeiger.",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+		"message": "Auszeichnung unter dem Textzeiger."
 	},
 	"searchRegexp": {
-		"message": "Verwende die /re/ Syntax für Suche als Regulärer Ausdruck",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
+		"message": "Verwende die /re/ Syntax für Suche als Regulärer Ausdruck"
 	},
 	"updateCheckManualUpdateHint": {
-		"message": "Eine erzwungene Aktualisierung wird die Lokalen Änderungen überschreiben.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Eine erzwungene Aktualisierung wird die Lokalen Änderungen überschreiben."
 	},
 	"toggleStyle": {
-		"message": "Style umschalten",
-		"description": "Label for the checkbox to enable/disable a style"
+		"message": "Style umschalten"
 	},
 	"importReplaceTooltip": {
-		"message": "Verwerfe den aktuellen Style-Inhalt und überschreibe ihn mit dem importierten",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Verwerfe den aktuellen Style-Inhalt und überschreibe ihn mit dem importierten"
 	},
 	"popupStylesFirst": {
-		"message": "Styles vor den Bedienelementen",
-		"description": "Label for the checkbox controlling section order in the popup."
+		"message": "Styles vor den Bedienelementen"
 	},
 	"sectionHelp": {
-		"message": "Mit Bereichen können Sie unterschiedliche Code-Teile auf unterschiedliche URLs in dem gleichen Style anwenden. Beispielsweise kann über einen einzigen Style die Startseite der Website geändert werden, während für den Rest der Website andere Änderungen gelten.",
-		"description": "Help text for sections"
+		"message": "Mit Bereichen können Sie unterschiedliche Code-Teile auf unterschiedliche URLs in dem gleichen Style anwenden. Beispielsweise kann über einen einzigen Style die Startseite der Website geändert werden, während für den Rest der Website andere Änderungen gelten."
 	},
 	"noStylesForSite": {
-		"message": "Für diese Webseite sind keine Styles installiert.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Für diese Webseite sind keine Styles installiert."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "und weitere",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "und weitere"
 	},
 	"appliesRemove": {
-		"message": "Löschen",
-		"description": "Label for the button to remove an 'applies' entry"
+		"message": "Löschen"
 	},
 	"updatesCurrentlyInstalled": {
-		"message": "Installierte Aktualisierungen:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+		"message": "Installierte Aktualisierungen:"
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Style im Mozilla Format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+		"message": "Style im Mozilla Format"
 	},
 	"manageTitle": {
-		"message": "Stylus",
 		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "Style erstellen für:",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+		"message": "Style erstellen für:"
 	},
 	"replace": {
-		"message": "Ersetzen",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Ersetzen"
 	},
 	"styleRegexpTestNone": {
-		"message": "Keine zutreffenden Tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
+		"message": "Keine zutreffenden Tabs"
 	},
 	"importReportLegendUpdatedMeta": {
-		"message": "Aktualisierte Meta Infos",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
+		"message": "Aktualisierte Meta Infos"
 	},
 	"appliesLabel": {
-		"message": "Gilt für",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Gilt für"
 	},
 	"openOptionsPopup": {
-		"message": "Optionen",
-		"description": "Go to Options UI"
+		"message": "Optionen"
 	},
 	"openManage": {
-		"message": "Verwalten",
-		"description": "Link to open the manage page."
+		"message": "Verwalten"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Aktualisierung fehlgeschlagen: Server hat den Fehler $code$ ausgegeben.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -441,295 +337,222 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Angeben",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Angeben"
 	},
 	"installUpdate": {
-		"message": "Aktualisierung installieren",
-		"description": "Label for the button to install an update for a single style"
+		"message": "Aktualisierung installieren"
 	},
 	"optionsCheckUpdate": {
-		"message": "Alle verfügbaren Aktualisierungen Installieren.",
-		"description": ""
+		"message": "Alle verfügbaren Aktualisierungen Installieren."
 	},
 	"importReportTitle": {
-		"message": "Importieren der Styles abgeschlossen.",
-		"description": "Title of the report shown after importing styles"
+		"message": "Importieren der Styles abgeschlossen."
 	},
 	"styleMozillaFormatHeading": {
 		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
 	"cm_matchHighlight": {
-		"message": "Hervorheben",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+		"message": "Hervorheben"
 	},
 	"styleRegexpPartialExplanation": {
-		"message": "Dieser Style verwendet teilweise Übereinstimmende RegExps unter Missachtung der <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document Spezifikationen</a>, welche eine vollständig Übereinstimmende URL benötigen. Der betroffene CSS Bereich wurde nicht auf die Website angewandt. Dieser Style wurde wahrscheinlich unter Stylish für Chrome erstellt, in der seit der ersten Version eine inkorrekte Überprüfung der Reguläre Ausdrücke 'regexp()' vorhanden ist (bekannter Fehler).",
-		"description": ""
+		"message": "Dieser Style verwendet teilweise Übereinstimmende RegExps unter Missachtung der <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document Spezifikationen</a>, welche eine vollständig Übereinstimmende URL benötigen. Der betroffene CSS Bereich wurde nicht auf die Website angewandt. Dieser Style wurde wahrscheinlich unter Stylish für Chrome erstellt, in der seit der ersten Version eine inkorrekte Überprüfung der Reguläre Ausdrücke 'regexp()' vorhanden ist (bekannter Fehler)."
 	},
 	"unreachableContentScript": {
-		"message": "Konnte nicht mit der Seite Kommunizieren. Bitte versuchen sie die Seite erneut zuladen.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
+		"message": "Konnte nicht mit der Seite Kommunizieren. Bitte versuchen sie die Seite erneut zuladen."
 	},
 	"sectionRemove": {
-		"message": "Bereich entfernen",
-		"description": "Label for the button to remove a section"
+		"message": "Bereich entfernen"
 	},
 	"disableAllStyles": {
-		"message": "Schalten Sie alle Stile aus",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Schalten Sie alle Stile aus"
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "Dieser Style scheint Lokal bearbeitet worden zu sein.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+		"message": "Dieser Style scheint Lokal bearbeitet worden zu sein."
 	},
 	"undoGlobal": {
-		"message": "Rückgängig (global)",
-		"description": "CSS-beautify global Undo button label"
+		"message": "Rückgängig (global)"
 	},
 	"updateCompleted": {
-		"message": "Aktualisierung abgeschlossen.",
-		"description": "Text that displays when an update completed"
+		"message": "Aktualisierung abgeschlossen."
 	},
 	"checkingForUpdate": {
-		"message": "Suche nach Aktualisierungen...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Suche nach Aktualisierungen..."
 	},
 	"styleRegexpTestFull": {
-		"message": "Zutreffende Tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
+		"message": "Zutreffende Tabs"
 	},
 	"manageMaxTargets": {
-		"message": "Anzahl der 'Gilt für' Elemente",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+		"message": "Anzahl der 'Gilt für' Elemente"
 	},
 	"manageFaviconsHelp": {
-		"message": "Stylus nutzt hierzu den externen Dienst https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+		"message": "Stylus nutzt hierzu den externen Dienst https://www.google.com/s2/favicons"
 	},
 	"updateCheckSkippedLocallyEdited": {
-		"message": "Dieser Style wurde Local bearbeitet.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Dieser Style wurde Local bearbeitet."
 	},
 	"optionsResetButton": {
-		"message": "Optionen zurücksetzten",
-		"description": ""
+		"message": "Optionen zurücksetzten"
 	},
 	"sectionCode": {
 		"message": "Code",
-		"description": "Label for the code for a section"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "'Löschen' im Editor Context-Menü hinzufügen",
-		"description": ""
+		"message": "'Löschen' im Editor Context-Menü hinzufügen"
 	},
 	"importReportLegendUpdatedBoth": {
-		"message": "Aktualisierte Meta Infos und Codes",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+		"message": "Aktualisierte Meta Infos und Codes"
 	},
 	"cm_smartIndent": {
-		"message": "Intelligenten Einzug verwenden",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Intelligenten Einzug verwenden"
 	},
 	"styleRegexpTestButton": {
-		"message": "Reguläre Ausdrücke Testen",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
+		"message": "Reguläre Ausdrücke Testen"
 	},
 	"appliesHelp": {
-		"message": "Legen Sie mit den Einstellungen von 'Gilt für' fest, für welche URLs der Code in diesem Bereich gelten soll.",
-		"description": "Help text for 'applies to' section"
+		"message": "Legen Sie mit den Einstellungen von 'Gilt für' fest, für welche URLs der Code in diesem Bereich gelten soll."
 	},
 	"editStyleHeading": {
-		"message": "Style bearbeiten",
-		"description": "Title of the page for editing styles"
+		"message": "Style bearbeiten"
 	},
 	"editDeleteText": {
-		"message": "Löschen",
-		"description": "Label for the context menu item in the editor to delete selected text"
+		"message": "Löschen"
 	},
 	"cm_matchHighlightSelection": {
-		"message": "Nur die Auswahl",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+		"message": "Nur die Auswahl"
 	},
 	"appliesUrlOption": {
 		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
 	},
 	"updateAllCheckSucceededSomeEdited": {
-		"message": "Einige Styles wurden nicht Aktualisiert um einen Datenverlust vorzubeugen. Die Aktualisierungen können durch eine manuelle Überprüfung erzwungen werden oder für alle verbliebenen Styles durch das ausführen der erzwungenen Aktualisierung (Lokal Bearbeitungen werden überschrieben).",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "Einige Styles wurden nicht Aktualisiert um einen Datenverlust vorzubeugen. Die Aktualisierungen können durch eine manuelle Überprüfung erzwungen werden oder für alle verbliebenen Styles durch das ausführen der erzwungenen Aktualisierung (Lokal Bearbeitungen werden überschrieben)."
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus funktioniert nicht auf Seiten wie diesen.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus funktioniert nicht auf Seiten wie diesen."
 	},
 	"manageOnlyUpdates": {
-		"message": "Nur mit Aktualisierungen oder Problemen",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
+		"message": "Nur mit Aktualisierungen oder Problemen"
 	},
 	"addStyleTitle": {
-		"message": "Style hinzufügen",
-		"description": "Title of the page for adding styles"
+		"message": "Style hinzufügen"
 	},
 	"importReplaceLabel": {
-		"message": "Style überschreiben",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Style überschreiben"
 	},
 	"dbError": {
-		"message": "Ein Fehler ist beim Verwenden der Stylus-Datenbank aufgetreten. Wollen Sie eine Webseite mit möglichen Lösungen besuchen?",
-		"description": "Prompt when a DB error is encountered"
+		"message": "Ein Fehler ist beim Verwenden der Stylus-Datenbank aufgetreten. Wollen Sie eine Webseite mit möglichen Lösungen besuchen?"
 	},
 	"optionsAdvanced": {
-		"message": "Erweitert",
-		"description": ""
+		"message": "Erweitert"
 	},
 	"importAppendTooltip": {
-		"message": "Füge den importierten Style an den aktuellen",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
+		"message": "Füge den importierten Style an den aktuellen"
 	},
 	"editorStylesButton": {
-		"message": "Editor Styles finden",
-		"description": "Find styles for the editor"
+		"message": "Editor Styles finden"
 	},
 	"optionsOpen": {
-		"message": "Öffnen",
-		"description": ""
+		"message": "Öffnen"
 	},
 	"helpKeyMapHotkey": {
-		"message": "Hotkey drücken",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Hotkey drücken"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "Ungültige Reguläre Ausdrücke übersprungen",
-		"description": "RegExp test report: label for the invalid expressions"
+		"message": "Ungültige Reguläre Ausdrücke übersprungen"
 	},
 	"replaceAll": {
-		"message": "Alles ersetzen",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Alles ersetzen"
 	},
 	"importReportUnchanged": {
-		"message": "Nichts wurde geändert.",
-		"description": "Message in the report shown after importing styles"
+		"message": "Nichts wurde geändert."
 	},
 	"optionsActions": {
-		"message": "Aktionen",
-		"description": ""
+		"message": "Aktionen"
 	},
 	"editGotoLine": {
-		"message": "Gehe zu Zeile (oder Zeile:Zeichen)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Gehe zu Zeile (oder Zeile:Zeichen)"
 	},
 	"manageOnlyLocalTooltip": {
-		"message": "(Diese Styles wurden nicht durch userstyles.org installiert)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
+		"message": "(Diese Styles wurden nicht durch userstyles.org installiert)"
 	},
 	"checkAllUpdates": {
-		"message": "Nach Aktualisierungen für alle Styles suchen",
-		"description": "Label for the button to check all styles for updates"
+		"message": "Nach Aktualisierungen für alle Styles suchen"
 	},
 	"openOptionsManage": {
-		"message": "Optionen",
-		"description": "Go to Options UI"
+		"message": "Optionen"
 	},
 	"issuesHelp": {
-		"message": "Die von <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> gefunden Fehler haben die folgenden Einstellungen:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "Die von <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> gefunden Fehler haben die folgenden Einstellungen:"
 	},
 	"optionsCustomizeBadge": {
-		"message": "Badge auf dem Toolbar-Icon",
-		"description": ""
+		"message": "Badge auf dem Toolbar-Icon"
 	},
 	"importReportLegendIdentical": {
-		"message": "Identische übersprungen",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+		"message": "Identische übersprungen"
 	},
 	"optionsPopupWidth": {
-		"message": "Popup breite (in pixeln)",
-		"description": ""
+		"message": "Popup breite (in pixeln)"
 	},
 	"confirmNo": {
-		"message": "Nein",
-		"description": "'No' button in a confirm dialog"
+		"message": "Nein"
 	},
 	"undo": {
-		"message": "Rückgängig",
-		"description": "Button label"
+		"message": "Rückgängig"
 	},
 	"cm_keyMap": {
-		"message": "Tastaturbelegung",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Tastaturbelegung"
 	},
 	"manageNewUI": {
-		"message": "Neues Verwaltungs Design-Layout.",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
+		"message": "Neues Verwaltungs Design-Layout."
 	},
 	"importReportUndoneTitle": {
-		"message": "Importierung wurde rückgängig gemacht.",
-		"description": "Title of the message box shown after undoing the import of styles"
+		"message": "Importierung wurde rückgängig gemacht."
 	},
 	"genericDisabledLabel": {
-		"message": "Deaktiviert",
-		"description": "Used in various lists/options to indicate that something is disabled"
+		"message": "Deaktiviert"
 	},
 	"cm_indentWithTabs": {
-		"message": "Tabs mit intelligentem Einzug verwenden",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+		"message": "Tabs mit intelligentem Einzug verwenden"
 	},
 	"replaceWith": {
-		"message": "Ersetzen durch",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Ersetzen durch"
 	},
 	"deleteStyleLabel": {
-		"message": "Löschen",
-		"description": "Label for the button to delete a style"
+		"message": "Löschen"
 	},
 	"updateCheckManualUpdateForce": {
-		"message": "Aktualisierungen Installieren (Lokale Bearbeitungen werden überschrieben)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Aktualisierungen Installieren (Lokale Bearbeitungen werden überschrieben)"
 	},
 	"optionsAdvancedExposeIframes": {
-		"message": "Ermögliche Iframes via HTML[stylus-iframe]",
-		"description": ""
+		"message": "Ermögliche Iframes via HTML[stylus-iframe]"
 	},
 	"addStyleLabel": {
-		"message": "Neuen Style erstellen",
-		"description": "Label for the button to go to the add style page"
+		"message": "Neuen Style erstellen"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "Zum deaktivieren der automatischen Aktualisierungs-Überprüfung den Wert auf 0 setzten.",
-		"description": ""
+		"message": "Zum deaktivieren der automatischen Aktualisierungs-Überprüfung den Wert auf 0 setzten."
 	},
 	"backupButtons": {
-		"message": "Datensicherung",
-		"description": "Heading for backup"
+		"message": "Datensicherung"
 	},
 	"manageOnlyEnabled": {
-		"message": "Nur aktivierte Styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Nur aktivierte Styles"
 	},
 	"editStyleLabel": {
-		"message": "Bearbeiten",
-		"description": "Label for the button to go to the edit style page"
+		"message": "Bearbeiten"
 	},
 	"cm_theme": {
 		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
 	},
 	"backupMessage": {
-		"message": "Wähle eine Datei aus oder ziehe die Datei auf diese Seite. (Drag and Drop)",
-		"description": "Message for backup"
+		"message": "Wähle eine Datei aus oder ziehe die Datei auf diese Seite. (Drag and Drop)"
 	},
 	"importReportUndone": {
-		"message": "Styles wiederherstellt",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+		"message": "Styles wiederherstellt"
 	},
 	"helpKeyMapCommand": {
-		"message": "Befehlsnamen eingeben",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Befehlsnamen eingeben"
 	},
 	"description": {
-		"message": "Gestalten Sie das Web mit Stylus, einem Manager für Benutzer-Styles, um. Stylus lässt Sie ganz einfach Themes und Skins für viele beliebte Webseiten installieren.",
-		"description": "Extension description"
+		"message": "Gestalten Sie das Web mit Stylus, einem Manager für Benutzer-Styles, um. Stylus lässt Sie ganz einfach Themes und Skins für viele beliebte Webseiten installieren."
 	}
 }
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index f295cf5d..5272b99e 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -1,186 +1,101 @@
 {
 	"appliesToEverything": {
-		"message": "Τα πάντα",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Τα πάντα"
 	},
 	"cm_tabSize": {
-		"message": "Μέγεθος καρτέλας",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Μέγεθος καρτέλας"
 	},
 	"enableStyleLabel": {
-		"message": "Ενεργοποίηση",
-		"description": "Label for the button to enable a style"
+		"message": "Ενεργοποίηση"
 	},
 	"styleMissingName": {
-		"message": "Εισάγετε ένα όνομα.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Εισάγετε ένα όνομα."
 	},
 	"appliesDomainOption": {
-		"message": "URL στον τομέα",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL στον τομέα"
 	},
 	"checkForUpdate": {
-		"message": "Έλεγχος για ενημερώσεις",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Έλεγχος για ενημερώσεις"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Όλα τα στυλ είναι ενημερωμένα.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Όλα τα στυλ είναι ενημερωμένα."
 	},
 	"helpAlt": {
-		"message": "Βοήθεια",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Βοήθεια"
 	},
 	"findStylesForSite": {
-		"message": "Αναζήτηση περισσότερων στυλ για αυτή την ιστοσελίδα",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Αναζήτηση περισσότερων στυλ για αυτή την ιστοσελίδα"
 	},
 	"manageHeading": {
-		"message": "Εγκατεστημένα Στυλ",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Εγκατεστημένα Στυλ"
 	},
 	"styleEnabledLabel": {
-		"message": "Ενεργοποιημένη",
-		"description": "Label for the enabled state of styles"
+		"message": "Ενεργοποιημένη"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Η μορφή του Mozilla κώδικα μπορεί να χρησιμοποιηθεί με το Stylish για το Firefox και μπορεί να υποβληθεί στο userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Η μορφή του Mozilla κώδικα μπορεί να χρησιμοποιηθεί με το Stylish για το Firefox και μπορεί να υποβληθεί στο userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Προσθήκη ένος άλλου τμήματος",
-		"description": "Label for the button to add a section"
+		"message": "Προσθήκη ένος άλλου τμήματος"
 	},
 	"styleSaveLabel": {
-		"message": "Αποθήκευση",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Αποθήκευση"
 	},
 	"writeStyleForURL": {
-		"message": "αυτή την διεύθυνση URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "αυτή την διεύθυνση URL"
 	},
 	"appliesAdd": {
-		"message": "Προσθήκη",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Προσθήκη"
 	},
 	"appliesRegexpOption": {
-		"message": "Διευθύνσεις URL που ταιριάζουν με την κανονική έκφραση",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "Διευθύνσεις URL που ταιριάζουν με την κανονική έκφραση"
 	},
 	"styleInstall": {
 		"message": "Εγκατάσταση του '$stylename$' στο Stylus;",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "Απενεργοποίηση",
-		"description": "Label for the button to disable a style"
+		"message": "Απενεργοποίηση"
 	},
 	"prefShowBadge": {
-		"message": "Εμφάνιση αριθμού των στυλ που δραστηριοποιούνται για την τρέχουσα τοποθεσία στην μπάρα εργαλείων",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Εμφάνιση αριθμού των στυλ που δραστηριοποιούνται για την τρέχουσα τοποθεσία στην μπάρα εργαλείων"
 	},
 	"menuShowBadge": {
-		"message": "Εμφάνιση ενεργους καταμέτρησης στυλ",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Εμφάνιση ενεργους καταμέτρησης στυλ"
 	},
 	"cm_lineWrapping": {
-		"message": "Αναδίπλωση λέξεων",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Αναδίπλωση λέξεων"
 	},
 	"styleCancelEditLabel": {
-		"message": "Πίσω στη διαχείριση",
-		"description": "Label for cancel button for style editing"
+		"message": "Πίσω στη διαχείριση"
 	},
 	"styleChangesNotSaved": {
-		"message": "Έχετε κάνει αλλαγές σε αυτό το ύφος χωρίς αποθήκευση.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Έχετε κάνει αλλαγές σε αυτό το ύφος χωρίς αποθήκευση."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Αποτυχία ενημέρωσης: απρόσιτος διακομιστής.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Αποτυχία ενημέρωσης: απρόσιτος διακομιστής."
 	},
 	"manageFilters": {
-		"message": "Φίλτρα",
-		"description": "Label for filters container"
+		"message": "Φίλτρα"
 	},
 	"applyAllUpdates": {
-		"message": "Εφαρμογή όλων των ενημερώσεων",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Εφαρμογή όλων των ενημερώσεων"
 	},
 	"deleteStyleConfirm": {
-		"message": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το στυλ;",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το στυλ;"
 	},
 	"styleBadRegexp": {
-		"message": "Το Regexp δεν είναι έγκυρο.",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "Το Regexp δεν είναι έγκυρο."
 	},
 	"optionsHeading": {
-		"message": "Επιλογές",
-		"description": "Heading for options section on manage page."
+		"message": "Επιλογές"
 	},
 	"appliesDisplay": {
 		"message": "Ισχύει για: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,7 +104,6 @@
 	},
 	"styleUpdate": {
 		"message": "Είστε σίγουροι ότι θέλετε να ενημερώσετε το '$stylename$';",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -197,12 +111,10 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Ενότητες",
-		"description": "Title for the style sections section"
+		"message": "Ενότητες"
 	},
 	"editStyleTitle": {
 		"message": "Επεξεργασία του στυλ $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +122,40 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Το στυλ είναι ενημερωμένο.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Το στυλ είναι ενημερωμένο."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "Διευθύνσεις URL που αρχίζουν με",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Διευθύνσεις URL που αρχίζουν με"
 	},
 	"popupStylesFirst": {
-		"message": "Στυλ λίστας πριν των εντολών στο μενού του κουμπιού γραμμής εργαλείων",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "Στυλ λίστας πριν των εντολών στο μενού του κουμπιού γραμμής εργαλείων"
 	},
 	"sectionHelp": {
-		"message": "Ενότητες σας επιτρέπουν να ορίσετε διαφορετικά κομμάτια του κώδικα για να εφαρμόζονται σε διαφορετικά σύνολα των διευθύνσεων URL στο ίδιο στυλ. Για παράδειγμα, ένα ενιαίο ύφος θα μπορούσε να αλλάξει την αρχική σελίδα ενός ιστότοπου με έναν τρόπο, ενώ αλλάζει το υπόλοιπο μιας τοποθεσίας ένας άλλος τρόπος.",
-		"description": "Help text for sections"
+		"message": "Ενότητες σας επιτρέπουν να ορίσετε διαφορετικά κομμάτια του κώδικα για να εφαρμόζονται σε διαφορετικά σύνολα των διευθύνσεων URL στο ίδιο στυλ. Για παράδειγμα, ένα ενιαίο ύφος θα μπορούσε να αλλάξει την αρχική σελίδα ενός ιστότοπου με έναν τρόπο, ενώ αλλάζει το υπόλοιπο μιας τοποθεσίας ένας άλλος τρόπος."
 	},
 	"noStylesForSite": {
-		"message": "Δεν υπάρχουν εγκατεστημένα στυλ για αυτή την ιστοσελίδα.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Δεν υπάρχουν εγκατεστημένα στυλ για αυτή την ιστοσελίδα."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "και πολλά άλλα",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "και πολλά άλλα"
 	},
 	"appliesRemove": {
-		"message": "Αφαίρεση",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+		"message": "Αφαίρεση"
 	},
 	"manageTitle": {
-		"message": "Κομψή",
-		"description": "Title for the manage page"
+		"message": "Κομψή"
 	},
 	"writeStyleFor": {
-		"message": "Γράψτε νέο στυλ για:",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Γράψτε νέο στυλ για:"
 	},
 	"appliesLabel": {
-		"message": "Ισχύει για",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Ισχύει για"
 	},
 	"openManage": {
-		"message": "Διαχείριση εγκατεστημένων στυλ",
-		"description": "Link to open the manage page."
+		"message": "Διαχείριση εγκατεστημένων στυλ"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Αποτυχία ενημέρωσης: ο διακομιστής ανταποκρίθηκε με κωδικό $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,139 +163,66 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Καθορισμός",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Καθορισμός"
 	},
 	"installUpdate": {
-		"message": "Εγκατάσταση ενημέρωσης",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Εγκατάσταση ενημέρωσης"
 	},
 	"stylusUnavailableForURL": {
-		"message": "To Stylus δεν λειτουργεί σε σελίδες όπως αυτή.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "To Stylus δεν λειτουργεί σε σελίδες όπως αυτή."
 	},
 	"sectionRemove": {
-		"message": "Αφαίρεση ενότητας",
-		"description": "Label for the button to remove a section"
+		"message": "Αφαίρεση ενότητας"
 	},
 	"disableAllStyles": {
-		"message": "Απενεργοποιηση ολων των στυλ",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Απενεργοποιηση ολων των στυλ"
 	},
 	"updateCompleted": {
-		"message": "Η ενημέρωση ολοκληρώθηκε.",
-		"description": "Text that displays when an update completed"
+		"message": "Η ενημέρωση ολοκληρώθηκε."
 	},
 	"checkingForUpdate": {
-		"message": "Έλεγχος...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Έλεγχος..."
 	},
 	"sectionCode": {
-		"message": "Κώδικας",
-		"description": "Label for the code for a section"
+		"message": "Κώδικας"
 	},
 	"cm_smartIndent": {
-		"message": "Χρήση έξυπνης εσοχής",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Χρήση έξυπνης εσοχής"
 	},
 	"appliesHelp": {
-		"message": "Χρησιμοποιήστε το \"Ισχύει για\" έλεγχοι ώστε να περιοριστουν ποιες διευθύνσεις τον κώδικα σε αυτό το τμήμα να εφαρμόζονται.",
-		"description": "Help text for 'applies to' section"
+		"message": "Χρησιμοποιήστε το \"Ισχύει για\" έλεγχοι ώστε να περιοριστουν ποιες διευθύνσεις τον κώδικα σε αυτό το τμήμα να εφαρμόζονται."
 	},
 	"editStyleHeading": {
-		"message": "Επεξεργασία Στυλ",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Επεξεργασία Στυλ"
 	},
 	"addStyleTitle": {
-		"message": "Προσθήκη στυλ",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Προσθήκη στυλ"
 	},
 	"dbError": {
-		"message": "Παρουσιάστηκε σφάλμα χρησιμοποιώντας την κομψή βάση δεδομένων. Θα θέλατε να επισκεφθείτε μια ιστοσελίδα με πιθανές λύσεις;",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Παρουσιάστηκε σφάλμα χρησιμοποιώντας την κομψή βάση δεδομένων. Θα θέλατε να επισκεφθείτε μια ιστοσελίδα με πιθανές λύσεις;"
 	},
 	"editGotoLine": {
-		"message": "Μετάβαση στη γραμμή (ή line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Μετάβαση στη γραμμή (ή line:col)"
 	},
 	"checkAllUpdates": {
-		"message": "Έλεγχος όλων των στυλ για ενημερώσεις",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Έλεγχος όλων των στυλ για ενημερώσεις"
 	},
 	"cm_indentWithTabs": {
-		"message": "Χρήση καρτελών με έξυπνη εσοχή",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Χρήση καρτελών με έξυπνη εσοχή"
 	},
 	"deleteStyleLabel": {
-		"message": "Διαγραφή",
-		"description": "Label for the button to delete a style"
+		"message": "Διαγραφή"
 	},
 	"addStyleLabel": {
-		"message": "Γράψτε νέο στυλ",
-		"description": "Label for the button to go to the add style page"
+		"message": "Γράψτε νέο στυλ"
 	},
 	"manageOnlyEnabled": {
-		"message": "Μόνο ενεργοποιημένα στυλ",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Μόνο ενεργοποιημένα στυλ"
 	},
 	"editStyleLabel": {
-		"message": "Επεξεργασία",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Επεξεργασία"
 	},
 	"description": {
-		"message": "Επαναπροσδιορίση του διαδίκτυου με το  Stylus, έναν διαχειριστή στυλ. Το Stylus σας επιτρέπει να εγκαταστήσετε εύκολα themes και skins για πολλές δημοφιλείς ιστοσελίδες.",
-		"description": "Extension description"
+		"message": "Επαναπροσδιορίση του διαδίκτυου με το  Stylus, έναν διαχειριστή στυλ. Το Stylus σας επιτρέπει να εγκαταστήσετε εύκολα themes και skins για πολλές δημοφιλείς ιστοσελίδες."
 	}
 }
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 3f700f83..42617669 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -1,199 +1,150 @@
 {
 	"appliesToEverything": {
-		"message": "Todos los sitios",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "Todos los sitios"
 	},
 	"defaultTheme": {
-		"message": "predeterminado",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "predeterminado"
 	},
 	"styleRegexpTestTitle": {
-		"message": "Lista de pestañas coincidentes abiertas (haga clic en la URL para poner el foco en esa pestaña)",
-		"description": "RegExp test report: title of the report"
+		"message": "Lista de pestañas coincidentes abiertas (haga clic en la URL para poner el foco en esa pestaña)"
 	},
 	"bckpInstStyles": {
-		"message": "Exportar estilos",
-		"description": ""
+		"message": "Exportar estilos"
 	},
 	"optionsUpdateInterval": {
-		"message": "Buscar e instalar automáticamente todas las actualizaciones disponibles de estilos de usuario (en horas)",
-		"description": ""
+		"message": "Buscar e instalar automáticamente todas las actualizaciones disponibles de estilos de usuario (en horas)"
 	},
 	"exportLabel": {
-		"message": "Exportar",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+		"message": "Exportar"
 	},
 	"issues": {
-		"message": "Problemas",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Problemas"
 	},
 	"optionsBadgeNormal": {
-		"message": "Color de fondo",
-		"description": ""
+		"message": "Color de fondo"
 	},
 	"updateCheckHistory": {
-		"message": "Historial de búsqueda de actualizaciones",
-		"description": ""
+		"message": "Historial de búsqueda de actualizaciones"
 	},
 	"cm_tabSize": {
-		"message": "Tamaño de la pestaña",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Tamaño de la pestaña"
 	},
 	"enableStyleLabel": {
-		"message": "Activar",
-		"description": "Label for the button to enable a style"
+		"message": "Activar"
 	},
 	"styleMissingName": {
-		"message": "Introduzca un nombre",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Introduzca un nombre"
 	},
 	"genericHistoryLabel": {
-		"message": "Historial",
-		"description": "Used in various places to show a history log of something"
+		"message": "Historial"
 	},
 	"shortcutsNote": {
-		"message": "Defina atajos de teclado",
-		"description": ""
+		"message": "Defina atajos de teclado"
 	},
 	"appliesDomainOption": {
-		"message": "URLs en el dominio",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URLs en el dominio"
 	},
 	"checkForUpdate": {
-		"message": "Buscar actualización",
-		"description": "Label for the button to check a single style for an update"
+		"message": "Buscar actualización"
 	},
 	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "El estilo no se aplicó debido a su uso incorrecto de 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
+		"message": "El estilo no se aplicó debido a su uso incorrecto de 'regexp()'"
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "Algunas reglas «regexp()» que no se pudieron compilar en absoluto.",
-		"description": ""
+		"message": "Algunas reglas «regexp()» que no se pudieron compilar en absoluto."
 	},
 	"importAppendLabel": {
-		"message": "Agregar al estilo",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Agregar al estilo"
 	},
 	"optionsOpenManager": {
-		"message": "Administrar estilos",
-		"description": ""
+		"message": "Administrar estilos"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "No se encontraron actualizaciones.",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "No se encontraron actualizaciones."
 	},
 	"importReportLegendAdded": {
-		"message": "añadidos",
-		"description": "Text after the number of styles added in the report shown after importing styles"
+		"message": "añadidos"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Pegue el código de formato Mozilla",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Pegue el código de formato Mozilla"
 	},
 	"dragDropMessage": {
-		"message": "Suelte su fichero de copia de seguridad en cualquier lugar de esta página para importarlo.",
-		"description": "Drag'n'drop message"
+		"message": "Suelte su fichero de copia de seguridad en cualquier lugar de esta página para importarlo."
 	},
 	"helpAlt": {
-		"message": "Ayuda",
-		"description": "Alternate text for help buttons"
+		"message": "Ayuda"
 	},
 	"confirmOK": {
-		"message": "Aceptar",
-		"description": ""
+		"message": "Aceptar"
 	},
 	"search": {
-		"message": "Buscar",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "Buscar"
 	},
 	"manageFaviconsGray": {
-		"message": "Atenuado",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+		"message": "Atenuado"
 	},
 	"confirmYes": {
-		"message": "Sí",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Sí"
 	},
 	"findStylesForSite": {
-		"message": "Encontrar más estilos para este sitio",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Encontrar más estilos para este sitio"
 	},
 	"manageHeading": {
-		"message": "Estilos instalados",
-		"description": "Heading for the manage page"
+		"message": "Estilos instalados"
 	},
 	"styleBeautify": {
-		"message": "Embellecer",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Embellecer"
 	},
 	"styleRegexpProblemTooltip": {
-		"message": "Número de secciones no aplicadas debido a un uso incorrecto de 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
+		"message": "Número de secciones no aplicadas debido a un uso incorrecto de 'regexp()'"
 	},
 	"styleEnabledLabel": {
-		"message": "Activado",
-		"description": "Label for the enabled state of styles"
+		"message": "Activado"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "El formato Mozilla del código se puede enviar a userstyles.org y usarse con el Stylish para Firefox clásico.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "El formato Mozilla del código se puede enviar a userstyles.org y usarse con el Stylish para Firefox clásico."
 	},
 	"sectionAdd": {
-		"message": "Añadir otra sección",
-		"description": "Label for the button to add a section"
+		"message": "Añadir otra sección"
 	},
 	"styleRegexpTestPartial": {
-		"message": "No completamente coincidentes, por tanto omitidos",
-		"description": "RegExp test report: label for the partially matching expressions"
+		"message": "No completamente coincidentes, por tanto omitidos"
 	},
 	"styleSaveLabel": {
-		"message": "Guardar",
-		"description": "Label for save button for style editing"
+		"message": "Guardar"
 	},
 	"confirmDelete": {
-		"message": "Borrar",
-		"description": ""
+		"message": "Borrar"
 	},
 	"confirmCancel": {
-		"message": "Cancelar",
-		"description": ""
+		"message": "Cancelar"
 	},
 	"retrieveBckp": {
-		"message": "Importar estilos",
-		"description": ""
+		"message": "Importar estilos"
 	},
 	"confirmStop": {
-		"message": "Detener",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Detener"
 	},
 	"writeStyleForURL": {
-		"message": "este URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "este URL"
 	},
 	"optionsSubheading": {
-		"message": "Más opciones",
-		"description": "Subheading for options section on manage page."
+		"message": "Más opciones"
 	},
 	"appliesAdd": {
-		"message": "Añadir",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Añadir"
 	},
 	"appliesRegexpOption": {
-		"message": "URLs coincidentes con la regexp",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URLs coincidentes con la regexp"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "Activa la escritura de CSS específico-para-iframe como «html[stylus-iframe] h1 { display:none }»",
-		"description": ""
+		"message": "Activa la escritura de CSS específico-para-iframe como «html[stylus-iframe] h1 { display:none }»"
 	},
 	"importReportLegendUpdatedCode": {
-		"message": "código actualizado",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
+		"message": "código actualizado"
 	},
 	"styleInstall": {
 		"message": "¿Quiere instalar «$stylename$» en Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -201,112 +152,85 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "Color de fondo cuando está desactivado",
-		"description": ""
+		"message": "Color de fondo cuando está desactivado"
 	},
 	"optionsCheck": {
-		"message": "Actualizar estilos",
-		"description": ""
+		"message": "Actualizar estilos"
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Obtener estilos en userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Obtener ayuda</a>",
-		"description": "Help text on the manage page"
+		"message": "<a href='https://userstyles.org'>Obtener estilos en userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Obtener ayuda</a>"
 	},
 	"manageOnlyLocal": {
-		"message": "Sólo estilos creados localmente",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+		"message": "Sólo estilos creados localmente"
 	},
 	"searchStyles": {
-		"message": "Buscar contenidos",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "Buscar contenidos"
 	},
 	"optionsUpdateImportNote": {
-		"message": "Al importar copias de seguridad de estilos desde una versión antigua o desde Stylish, realice una única búsqueda manual de actualizaciones en el administrador de estilos para asegurarse de que todos los estilos están actualizados.",
-		"description": ""
+		"message": "Al importar copias de seguridad de estilos desde una versión antigua o desde Stylish, realice una única búsqueda manual de actualizaciones en el administrador de estilos para asegurarse de que todos los estilos están actualizados."
 	},
 	"checkAllUpdatesForce": {
-		"message": "Comprobar de nuevo, ¡no he editado ningún estilo!",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Comprobar de nuevo, ¡no he editado ningún estilo!"
 	},
 	"unreachableFileHint": {
-		"message": "Stylus puede acceder a URL file:// solo si activa la casilla correspondiente para la extensión Stylus en la página chrome://extensions.",
-		"description": "Note in the toolbar popup for file:// URLs"
+		"message": "Stylus puede acceder a URL file:// solo si activa la casilla correspondiente para la extensión Stylus en la página chrome://extensions."
 	},
 	"disableStyleLabel": {
-		"message": "Desactivar",
-		"description": "Label for the button to disable a style"
+		"message": "Desactivar"
 	},
 	"prefShowBadge": {
-		"message": "Número de estilos activos en el sitio actual",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Número de estilos activos en el sitio actual"
 	},
 	"manageFavicons": {
-		"message": "Favicons en la columna se-aplica-a",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+		"message": "Favicons en la columna se-aplica-a"
 	},
 	"menuShowBadge": {
-		"message": "Mostrar número de estilos activos",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Mostrar número de estilos activos"
 	},
 	"cm_lineWrapping": {
-		"message": "Ajuste de línea",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Ajuste de línea"
 	},
 	"styleCancelEditLabel": {
-		"message": "Volver al administrador",
-		"description": "Label for cancel button for style editing"
+		"message": "Volver al administrador"
 	},
 	"styleChangesNotSaved": {
-		"message": "Ha realizado cambios en este estilo sin guardarlos.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+		"message": "Ha realizado cambios en este estilo sin guardarlos."
 	},
 	"importLabel": {
-		"message": "Importar",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Importar"
 	},
 	"shortcuts": {
-		"message": "Atajos",
-		"description": "Go to shortcut configuration"
+		"message": "Atajos"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Error de actualización: no se pudo contactar con el servidor.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Error de actualización: no se pudo contactar con el servidor."
 	},
 	"manageFilters": {
-		"message": "Filtros",
-		"description": "Label for filters container"
+		"message": "Filtros"
 	},
 	"applyAllUpdates": {
-		"message": "Aplicar todas las actualizaciones",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Aplicar todas las actualizaciones"
 	},
 	"optionsReset": {
-		"message": "Restablecer las opciones a sus valores predeterminados.",
-		"description": ""
+		"message": "Restablecer las opciones a sus valores predeterminados."
 	},
 	"optionsCustomizeUpdate": {
-		"message": "Actualizaciones",
-		"description": ""
+		"message": "Actualizaciones"
 	},
 	"deleteStyleConfirm": {
-		"message": "¿Confirma que quiere eliminar este estilo?",
-		"description": "Confirmation before deleting a style"
+		"message": "¿Confirma que quiere eliminar este estilo?"
 	},
 	"optionsCustomizePopup": {
-		"message": "Cuadro emergente",
-		"description": ""
+		"message": "Cuadro emergente"
 	},
 	"styleBadRegexp": {
-		"message": "La expresión regular proporcionada no es válida.",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "La expresión regular proporcionada no es válida."
 	},
 	"optionsHeading": {
-		"message": "Opciones",
-		"description": "Heading for options section on manage page."
+		"message": "Opciones"
 	},
 	"appliesDisplay": {
 		"message": "Se aplica a: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -314,12 +238,10 @@
 		}
 	},
 	"openStylesManager": {
-		"message": "Abrir administrador de estilos",
-		"description": "Label for the style maanger opener in the browser action context menu."
+		"message": "Abrir administrador de estilos"
 	},
 	"styleUpdate": {
 		"message": "¿Confirma que quiere actualizar «$stylename$»?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -327,16 +249,13 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Secciones",
-		"description": "Title for the style sections section"
+		"message": "Secciones"
 	},
 	"importReportLegendInvalid": {
-		"message": "no válidos omitidos",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
+		"message": "no válidos omitidos"
 	},
 	"editStyleTitle": {
 		"message": "Editar estilo $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -344,96 +263,70 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "El estilo está actualizado.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "El estilo está actualizado."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URLs que empiezan con",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
+		"message": "URLs que empiezan con"
 	},
 	"cm_matchHighlightToken": {
-		"message": "Resaltado de palabra señalada",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+		"message": "Resaltado de palabra señalada"
 	},
 	"searchRegexp": {
-		"message": "Use la sintaxis /re/ para búsquedas con expresiones regulares",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
+		"message": "Use la sintaxis /re/ para búsquedas con expresiones regulares"
 	},
 	"updateCheckManualUpdateHint": {
-		"message": "Forzar una actualización sobrescribirá cualquier edición local.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Forzar una actualización sobrescribirá cualquier edición local."
 	},
 	"toggleStyle": {
-		"message": "Conmutar estilo",
-		"description": "Label for the checkbox to enable/disable a style"
+		"message": "Conmutar estilo"
 	},
 	"importReplaceTooltip": {
-		"message": "Descarta contenidos del estilo actual y los sobrescribe con el estilo importado",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Descarta contenidos del estilo actual y los sobrescribe con el estilo importado"
 	},
 	"popupStylesFirst": {
-		"message": "Estilos antes que las órdenes",
-		"description": "Label for the checkbox controlling section order in the popup."
+		"message": "Estilos antes que las órdenes"
 	},
 	"sectionHelp": {
-		"message": "Las secciones le permiten definir distintos fragmentos de código en el mismo estilo para aplicarlos a diferentes conjuntos de URLs. Por ejemplo, un único estilo puede cambiar la página de inicio de un sitio de una forma y modificar el resto del sitio de otra.",
-		"description": "Help text for sections"
+		"message": "Las secciones le permiten definir distintos fragmentos de código en el mismo estilo para aplicarlos a diferentes conjuntos de URLs. Por ejemplo, un único estilo puede cambiar la página de inicio de un sitio de una forma y modificar el resto del sitio de otra."
 	},
 	"noStylesForSite": {
-		"message": "No hay estilos instalados para este sitio.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "No hay estilos instalados para este sitio."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "y más sitios",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "y más sitios"
 	},
 	"appliesRemove": {
-		"message": "Eliminar",
-		"description": "Label for the button to remove an 'applies' entry"
+		"message": "Eliminar"
 	},
 	"updatesCurrentlyInstalled": {
-		"message": "Actualizaciones instaladas:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+		"message": "Actualizaciones instaladas:"
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Estilo en formato Mozilla",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Estilo en formato Mozilla"
 	},
 	"writeStyleFor": {
-		"message": "Escribir estilo para:",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+		"message": "Escribir estilo para:"
 	},
 	"replace": {
-		"message": "Reemplazar",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Reemplazar"
 	},
 	"styleRegexpTestNone": {
-		"message": "No hay pestañas coincidentes",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
+		"message": "No hay pestañas coincidentes"
 	},
 	"importReportLegendUpdatedMeta": {
-		"message": "actualizaron la meta información",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
+		"message": "actualizaron la meta información"
 	},
 	"appliesLabel": {
-		"message": "Se aplica a",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Se aplica a"
 	},
 	"openOptionsPopup": {
-		"message": "Opciones",
-		"description": "Go to Options UI"
+		"message": "Opciones"
 	},
 	"openManage": {
-		"message": "Administrar",
-		"description": "Link to open the manage page."
+		"message": "Administrar"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Error de actualización: el servidor ha respondido con el código $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -441,303 +334,222 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Especificar",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Especificar"
 	},
 	"installUpdate": {
-		"message": "Instalar actualización",
-		"description": "Label for the button to install an update for a single style"
+		"message": "Instalar actualización"
 	},
 	"optionsCheckUpdate": {
-		"message": "Buscar e instalar todas las actualizaciones disponibles",
-		"description": ""
+		"message": "Buscar e instalar todas las actualizaciones disponibles"
 	},
 	"importReportTitle": {
-		"message": "Se completó la importación de estilos",
-		"description": "Title of the report shown after importing styles"
+		"message": "Se completó la importación de estilos"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Formato Mozilla",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Formato Mozilla"
 	},
 	"cm_matchHighlight": {
-		"message": "Resaltar",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+		"message": "Resaltar"
 	},
 	"styleRegexpPartialExplanation": {
-		"message": "Este estilo utiliza expresiones regulares (regexps) parcialmente coincidentes violando así la <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>especificación @document de CSS4</a> que requiere una coincidencia completa de URL. Las secciones CSS afectadas no se aplicaron a la página. Probablemente este estilo fue creado con Stylish-para-Chrome, que evalúa de modo incorrecto las reglas 'regexp()' desde la primera versión (un fallo conocido).",
-		"description": ""
+		"message": "Este estilo utiliza expresiones regulares (regexps) parcialmente coincidentes violando así la <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>especificación @document de CSS4</a> que requiere una coincidencia completa de URL. Las secciones CSS afectadas no se aplicaron a la página. Probablemente este estilo fue creado con Stylish-para-Chrome, que evalúa de modo incorrecto las reglas 'regexp()' desde la primera versión (un fallo conocido)."
 	},
 	"styleBeautifyIndentConditional": {
-		"message": "Sangrar @media, @supports",
-		"description": "CSS-beautifier option"
+		"message": "Sangrar @media, @supports"
 	},
 	"unreachableContentScript": {
-		"message": "No se pudo comunicar con la página. Pruebe a recargar la pestaña.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
+		"message": "No se pudo comunicar con la página. Pruebe a recargar la pestaña."
 	},
 	"sectionRemove": {
-		"message": "Eliminar sección",
-		"description": "Label for the button to remove a section"
+		"message": "Eliminar sección"
 	},
 	"disableAllStyles": {
-		"message": "Desactivar todos los estilos",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Desactivar todos los estilos"
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "Este estilo podría haberse editado localmente.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+		"message": "Este estilo podría haberse editado localmente."
 	},
 	"undoGlobal": {
-		"message": "Deshacer en todas las secciones",
-		"description": "CSS-beautify global Undo button label"
+		"message": "Deshacer en todas las secciones"
 	},
 	"updateCompleted": {
-		"message": "Actualización completada.",
-		"description": "Text that displays when an update completed"
+		"message": "Actualización completada."
 	},
 	"checkingForUpdate": {
-		"message": "Buscando...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Buscando..."
 	},
 	"styleRegexpTestFull": {
-		"message": "Pestañas coincidentes",
-		"description": "RegExp test report: label for the fully matching expressions"
+		"message": "Pestañas coincidentes"
 	},
 	"manageMaxTargets": {
-		"message": "Número de elementos se-aplica-a",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+		"message": "Número de elementos se-aplica-a"
 	},
 	"manageFaviconsHelp": {
-		"message": "Stylus usa un servicio externo https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+		"message": "Stylus usa un servicio externo https://www.google.com/s2/favicons"
 	},
 	"updateCheckSkippedLocallyEdited": {
-		"message": "Este estilo se editó localmente",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Este estilo se editó localmente"
 	},
 	"optionsResetButton": {
-		"message": "Restablecer opciones",
-		"description": ""
+		"message": "Restablecer opciones"
 	},
 	"sectionCode": {
-		"message": "Código",
-		"description": "Label for the code for a section"
+		"message": "Código"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "Añadir 'Eliminar' al menú contextual del editor",
-		"description": ""
+		"message": "Añadir 'Eliminar' al menú contextual del editor"
 	},
 	"importReportLegendUpdatedBoth": {
-		"message": "actualizarón tanto meta información como código",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+		"message": "actualizarón tanto meta información como código"
 	},
 	"cm_smartIndent": {
-		"message": "Usar sangría inteligente",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Usar sangría inteligente"
 	},
 	"styleRegexpTestButton": {
-		"message": "Prueba de regexp",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
+		"message": "Prueba de regexp"
 	},
 	"appliesHelp": {
-		"message": "Utilice los controles 'Se aplica a' para limitar a qué URLs se aplica el código de esta sección.",
-		"description": "Help text for 'applies to' section"
+		"message": "Utilice los controles 'Se aplica a' para limitar a qué URLs se aplica el código de esta sección."
 	},
 	"editStyleHeading": {
-		"message": "Editar estilo",
-		"description": "Title of the page for editing styles"
+		"message": "Editar estilo"
 	},
 	"editDeleteText": {
-		"message": "Eliminar",
-		"description": "Label for the context menu item in the editor to delete selected text"
+		"message": "Eliminar"
 	},
 	"stylusUnavailableForURLdetails": {
-		"message": "Como medida de precaución, el navegador prohíbe que las extensiones afecten a sus páginas internas (como chrome://version o about:addons) además de las páginas internas de otras extensiones. Cada navegador además restringe el acceso a su propia galería de extensiones (como Chrome Web Store o AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Como medida de precaución, el navegador prohíbe que las extensiones afecten a sus páginas internas (como chrome://version o about:addons) además de las páginas internas de otras extensiones. Cada navegador además restringe el acceso a su propia galería de extensiones (como Chrome Web Store o AMO)."
 	},
 	"cm_matchHighlightSelection": {
-		"message": "Sólo selección",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Sólo selección"
 	},
 	"updateAllCheckSucceededSomeEdited": {
-		"message": "No se buscaron actualizaciones de algunos estilos actualizables para evitar la pérdida de posibles ediciones locales. Se puede forzar la búsqueda de actualizaciones mediante comprobación individual, o ejecutando otra búsqueda para todos los estilos (las ediciones locales se sobrescribirán).",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "No se buscaron actualizaciones de algunos estilos actualizables para evitar la pérdida de posibles ediciones locales. Se puede forzar la búsqueda de actualizaciones mediante comprobación individual, o ejecutando otra búsqueda para todos los estilos (las ediciones locales se sobrescribirán)."
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus no funciona en páginas como esta.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus no funciona en páginas como esta."
 	},
 	"manageOnlyUpdates": {
-		"message": "Sólo con actualizaciones o problemas",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
+		"message": "Sólo con actualizaciones o problemas"
 	},
 	"addStyleTitle": {
-		"message": "Añadir estilo",
-		"description": "Title of the page for adding styles"
+		"message": "Añadir estilo"
 	},
 	"importReplaceLabel": {
-		"message": "Sobrescribir estilo",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Sobrescribir estilo"
 	},
 	"dbError": {
-		"message": "Ocurrió un error con la base de datos de Stylus. ¿Desea visitar una página web con posibles soluciones?",
-		"description": "Prompt when a DB error is encountered"
+		"message": "Ocurrió un error con la base de datos de Stylus. ¿Desea visitar una página web con posibles soluciones?"
 	},
 	"optionsAdvanced": {
-		"message": "Avanzadas",
-		"description": ""
+		"message": "Avanzadas"
 	},
 	"importAppendTooltip": {
-		"message": "Agrega el estilo importado al estilo actual",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
+		"message": "Agrega el estilo importado al estilo actual"
 	},
 	"editorStylesButton": {
-		"message": "Buscar estilos del editor",
-		"description": "Find styles for the editor"
+		"message": "Buscar estilos del editor"
 	},
 	"optionsOpen": {
-		"message": "Abrir",
-		"description": ""
+		"message": "Abrir"
 	},
 	"helpKeyMapHotkey": {
-		"message": "Pulse un atajo",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Pulse un atajo"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "Expresiones regulares no válidas omitidas",
-		"description": "RegExp test report: label for the invalid expressions"
+		"message": "Expresiones regulares no válidas omitidas"
 	},
 	"replaceAll": {
-		"message": "Reemplazar todo",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Reemplazar todo"
 	},
 	"importReportUnchanged": {
-		"message": "No se cambió nada.",
-		"description": "Message in the report shown after importing styles"
+		"message": "No se cambió nada."
 	},
 	"optionsActions": {
-		"message": "Acciones",
-		"description": ""
+		"message": "Acciones"
 	},
 	"editGotoLine": {
-		"message": "Ir a la línea (o a línea:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Ir a la línea (o a línea:col)"
 	},
 	"manageOnlyLocalTooltip": {
-		"message": "(los estilos no instalados mediante una página de userstyles.org)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
+		"message": "(los estilos no instalados mediante una página de userstyles.org)"
 	},
 	"checkAllUpdates": {
-		"message": "Buscar actualizaciones para todos los estilos",
-		"description": "Label for the button to check all styles for updates"
+		"message": "Buscar actualizaciones para todos los estilos"
 	},
 	"openOptionsManage": {
-		"message": "Interfaz de opciones",
-		"description": "Go to Options UI"
+		"message": "Interfaz de opciones"
 	},
 	"issuesHelp": {
-		"message": "Problemas encontrados por <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> con estas reglas aplicadas:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "Problemas encontrados por <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> con estas reglas aplicadas:"
 	},
 	"optionsCustomizeBadge": {
-		"message": "Distintivo en el icono de barra de herramientas",
-		"description": ""
+		"message": "Distintivo en el icono de barra de herramientas"
 	},
 	"importReportLegendIdentical": {
-		"message": "idénticos omitidos",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+		"message": "idénticos omitidos"
 	},
 	"optionsPopupWidth": {
-		"message": "Anchura del diálogo emergente (en píxeles)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
+		"message": "Anchura del diálogo emergente (en píxeles)"
 	},
 	"undo": {
-		"message": "Deshacer",
-		"description": "Button label"
+		"message": "Deshacer"
 	},
 	"cm_keyMap": {
-		"message": "Mapa de teclado",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Mapa de teclado"
 	},
 	"manageNewUI": {
-		"message": "Nuevo diseño de interfaz de gestión",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
+		"message": "Nuevo diseño de interfaz de gestión"
 	},
 	"importReportUndoneTitle": {
-		"message": "La importación ha sido revertida",
-		"description": "Title of the message box shown after undoing the import of styles"
+		"message": "La importación ha sido revertida"
 	},
 	"genericDisabledLabel": {
-		"message": "Desactivado",
-		"description": "Used in various lists/options to indicate that something is disabled"
+		"message": "Desactivado"
 	},
 	"cm_indentWithTabs": {
-		"message": "Usar pestañas con sangría inteligente",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+		"message": "Usar pestañas con sangría inteligente"
 	},
 	"replaceWith": {
-		"message": "Reemplazar con",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Reemplazar con"
 	},
 	"deleteStyleLabel": {
-		"message": "Eliminar",
-		"description": "Label for the button to delete a style"
+		"message": "Eliminar"
 	},
 	"updateCheckManualUpdateForce": {
-		"message": "Instalar actualización (se sobrescribirán las ediciones locales)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Instalar actualización (se sobrescribirán las ediciones locales)"
 	},
 	"optionsAdvancedExposeIframes": {
-		"message": "Exponer marcos integrados (iframes) vía HTML[stylus-iframe]",
-		"description": ""
+		"message": "Exponer marcos integrados (iframes) vía HTML[stylus-iframe]"
 	},
 	"addStyleLabel": {
-		"message": "Escribir un nuevo estilo",
-		"description": "Label for the button to go to the add style page"
+		"message": "Escribir un nuevo estilo"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "Para desactivar las búsquedas automáticas de actualizaciones, establezca el intervalo a 0",
-		"description": ""
+		"message": "Para desactivar las búsquedas automáticas de actualizaciones, establezca el intervalo a 0"
 	},
 	"backupButtons": {
-		"message": "Copia de seguridad",
-		"description": "Heading for backup"
+		"message": "Copia de seguridad"
 	},
 	"manageOnlyEnabled": {
-		"message": "Sólo estilos activos",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Sólo estilos activos"
 	},
 	"editStyleLabel": {
-		"message": "Editar",
-		"description": "Label for the button to go to the edit style page"
+		"message": "Editar"
 	},
 	"cm_theme": {
-		"message": "Temas",
-		"description": "Label for the style editor's CSS theme."
+		"message": "Temas"
 	},
 	"backupMessage": {
-		"message": "Seleccione un fichero o arrástrelo y suéltelo en esta página.",
-		"description": "Message for backup"
+		"message": "Seleccione un fichero o arrástrelo y suéltelo en esta página."
 	},
 	"importReportUndone": {
-		"message": "estilos fueron revertidos",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+		"message": "estilos fueron revertidos"
 	},
 	"helpKeyMapCommand": {
-		"message": "Nombre del comando",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Nombre del comando"
 	},
 	"description": {
-		"message": "Rediseñe la web con Stylus, un administrador de estilos de usuario. Stylus le permite instalar fácilmente temas y coberturas para muchos sitios populares.",
-		"description": "Extension description"
+		"message": "Rediseñe la web con Stylus, un administrador de estilos de usuario. Stylus le permite instalar fácilmente temas y coberturas para muchos sitios populares."
 	}
 }
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index d13fbe07..028a3587 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -1,208 +1,91 @@
 {
 	"appliesToEverything": {
-		"message": "Kaikki",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Kaikki"
 	},
 	"enableStyleLabel": {
-		"message": "Aktivoi",
-		"description": "Label for the button to enable a style"
+		"message": "Aktivoi"
 	},
 	"styleMissingName": {
-		"message": "Syötä nimi.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Syötä nimi."
 	},
 	"appliesDomainOption": {
-		"message": "URL ositteita domainilla",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL ositteita domainilla"
 	},
 	"checkForUpdate": {
-		"message": "Hae päivityksiä",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Hae päivityksiä"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "All styles are up to date."
 	},
 	"helpAlt": {
-		"message": "Apu",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Apu"
 	},
 	"findStylesForSite": {
-		"message": "Hae lisää tyylejä tälle sivustolle",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Hae lisää tyylejä tälle sivustolle"
 	},
 	"manageHeading": {
-		"message": "Asennetut Tyylit",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Asennetut Tyylit"
 	},
 	"styleEnabledLabel": {
-		"message": "Aktivoitu",
-		"description": "Label for the enabled state of styles"
+		"message": "Aktivoitu"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla formaattia koodista voidaan käyttää Stylish Firefoxille ohjelmassa ja voidaan lähettää userstyles.orgiin.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Mozilla formaattia koodista voidaan käyttää Stylish Firefoxille ohjelmassa ja voidaan lähettää userstyles.orgiin."
 	},
 	"sectionAdd": {
-		"message": "Lisää uusi osio",
-		"description": "Label for the button to add a section"
+		"message": "Lisää uusi osio"
 	},
 	"styleSaveLabel": {
-		"message": "Tallenna",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "Tallenna"
 	},
 	"appliesAdd": {
-		"message": "Lisää",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Lisää"
 	},
 	"appliesRegexpOption": {
-		"message": "URL ositteet jotka vastaavat regexpiä",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URL ositteet jotka vastaavat regexpiä"
 	},
 	"styleInstall": {
 		"message": "Asennetaanko '$stylename$' Stylusiin?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "Poista Käytöstä",
-		"description": "Label for the button to disable a style"
+		"message": "Poista Käytöstä"
 	},
 	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Show number of styles active for the current site on the toolbar button"
 	},
 	"styleCancelEditLabel": {
-		"message": "Takaisin hallintapaneeliin",
-		"description": "Label for cancel button for style editing"
+		"message": "Takaisin hallintapaneeliin"
 	},
 	"styleChangesNotSaved": {
-		"message": "Olet tehnyt muutoksia tähän tyyliin tallentamatta.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Olet tehnyt muutoksia tähän tyyliin tallentamatta."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Päivitys epäonnistui: ei voitu yhdistää palvelimeen.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Päivitys epäonnistui: ei voitu yhdistää palvelimeen."
 	},
 	"deleteStyleConfirm": {
-		"message": "Oletko varma että haluat poistaa tämän tyylin?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "Oletko varma että haluat poistaa tämän tyylin?"
 	},
 	"styleBadRegexp": {
-		"message": "Regexp ei kelpaa.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "Regexp ei kelpaa."
 	},
 	"appliesDisplay": {
 		"message": "Kooskee: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
-		"message": "Osiot",
-		"description": "Title for the style sections section"
+		"message": "Osiot"
 	},
 	"editStyleTitle": {
 		"message": "Muokkaa Tyyliä $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +93,37 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Tyyli on ajan tasalla.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Tyyli on ajan tasalla."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL osoitteet jotka alkavat",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "URL osoitteet jotka alkavat"
 	},
 	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "List styles before commands in the toolbar button menu"
 	},
 	"sectionHelp": {
-		"message": "Osiot antavat sinun tarkentaa koodin eri osia niin että ne koskevat eri URL osoitteita samassa tyylissä. Esimerkiksi, yksi tyyli voi muokata kotisivua yhdellä tavalla kun se muokkaa koko muuta sivustoa toisella tavalla.",
-		"description": "Help text for sections"
+		"message": "Osiot antavat sinun tarkentaa koodin eri osia niin että ne koskevat eri URL osoitteita samassa tyylissä. Esimerkiksi, yksi tyyli voi muokata kotisivua yhdellä tavalla kun se muokkaa koko muuta sivustoa toisella tavalla."
 	},
 	"noStylesForSite": {
-		"message": "Ei asennettuja tyylejä tällä sivustolla.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Ei asennettuja tyylejä tällä sivustolla."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "ja lisää",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "ja lisää"
 	},
 	"appliesRemove": {
-		"message": "Poista",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+		"message": "Poista"
 	},
 	"manageTitle": {
-		"message": "Tyylikäs",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Tyylikäs"
 	},
 	"appliesLabel": {
-		"message": "Koskee",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Koskee"
 	},
 	"openManage": {
-		"message": "Hallitse asennettuja tyylejä",
-		"description": "Link to open the manage page."
+		"message": "Hallitse asennettuja tyylejä"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Päivitys epäonnistui: palvelin vastasi koodilla $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,135 +131,45 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Tarkenna",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Tarkenna"
 	},
 	"installUpdate": {
-		"message": "Asenna päivitys",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Asenna päivitys"
 	},
 	"sectionRemove": {
-		"message": "Poista osio",
-		"description": "Label for the button to remove a section"
-	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Poista osio"
 	},
 	"updateCompleted": {
-		"message": "Päivitys suoritettu.",
-		"description": "Text that displays when an update completed"
+		"message": "Päivitys suoritettu."
 	},
 	"checkingForUpdate": {
-		"message": "Tarkistetaan...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Tarkistetaan..."
 	},
 	"sectionCode": {
-		"message": "Koodi",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Koodi"
 	},
 	"appliesHelp": {
-		"message": "Käytä 'Koskee' kontrolleja rajoittaaksesi mitä URL osoitteisiin tämä osio koodista koskee.",
-		"description": "Help text for 'applies to' section"
+		"message": "Käytä 'Koskee' kontrolleja rajoittaaksesi mitä URL osoitteisiin tämä osio koodista koskee."
 	},
 	"editStyleHeading": {
-		"message": "Muokkaa Tyyliä",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Muokkaa Tyyliä"
 	},
 	"addStyleTitle": {
-		"message": "Lisää Tyyli",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Lisää Tyyli"
 	},
 	"checkAllUpdates": {
-		"message": "Tarkista kaikki tyylit päivityksien varalta",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Tarkista kaikki tyylit päivityksien varalta"
 	},
 	"deleteStyleLabel": {
-		"message": "Poista",
-		"description": "Label for the button to delete a style"
+		"message": "Poista"
 	},
 	"addStyleLabel": {
-		"message": "Uusi Tyyli",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Uusi Tyyli"
 	},
 	"editStyleLabel": {
-		"message": "Muokkaa",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Muokkaa"
 	},
 	"description": {
-		"message": "Uudelleen stailaa netti Stylusillä, käyttäjän tyyli hallintapaneelilla. Stylus antaa sinun helposti asentaa teemoja ja skinejä palvelluille kuten Google, Facebook, YouTube, Orkut, ja monelle, monelle muulle sivustolle.",
-		"description": "Extension description"
+		"message": "Uudelleen stailaa netti Stylusillä, käyttäjän tyyli hallintapaneelilla. Stylus antaa sinun helposti asentaa teemoja ja skinejä palvelluille kuten Google, Facebook, YouTube, Orkut, ja monelle, monelle muulle sivustolle."
 	}
 }
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 17a1cec8..316eb890 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -1,186 +1,101 @@
 {
 	"appliesToEverything": {
-		"message": "Tout",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "Tout"
 	},
 	"defaultTheme": {
-		"message": "défaut",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "défaut"
 	},
 	"exportLabel": {
-		"message": "Exportez",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Exportez"
 	},
 	"cm_tabSize": {
-		"message": "Taille des tabulations",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Taille des tabulations"
 	},
 	"enableStyleLabel": {
-		"message": "Activer",
-		"description": "Label for the button to enable a style"
+		"message": "Activer"
 	},
 	"styleMissingName": {
-		"message": "Veuillez saisir un nom.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Veuillez saisir un nom."
 	},
 	"appliesDomainOption": {
-		"message": "URL sur le domaine",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL sur le domaine"
 	},
 	"checkForUpdate": {
-		"message": "Rechercher des mises à jour",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Rechercher des mises à jour"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "All styles are up to date."
 	},
 	"helpAlt": {
-		"message": "Aide",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "Aide"
 	},
 	"confirmYes": {
-		"message": "Oui",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Oui"
 	},
 	"findStylesForSite": {
-		"message": "Rechercher d'autres styles pour ce site",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Rechercher d'autres styles pour ce site"
 	},
 	"manageHeading": {
-		"message": "Styles installés",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Styles installés"
 	},
 	"styleEnabledLabel": {
-		"message": "Activé",
-		"description": "Label for the enabled state of styles"
+		"message": "Activé"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Le code au format Mozilla peut être utilisé dans Stylish for Firefox et envoyé à userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Le code au format Mozilla peut être utilisé dans Stylish for Firefox et envoyé à userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Ajouter une section",
-		"description": "Label for the button to add a section"
+		"message": "Ajouter une section"
 	},
 	"styleSaveLabel": {
-		"message": "Enregistrer",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Enregistrer"
 	},
 	"writeStyleForURL": {
-		"message": "cette URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "cette URL"
 	},
 	"appliesAdd": {
-		"message": "Ajouter",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Ajouter"
 	},
 	"appliesRegexpOption": {
-		"message": "URL correspondant à l'expression régulière",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URL correspondant à l'expression régulière"
 	},
 	"styleInstall": {
 		"message": "Installer \"$stylename$\" dans Stylus ?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "Désactiver",
-		"description": "Label for the button to disable a style"
+		"message": "Désactiver"
 	},
 	"prefShowBadge": {
-		"message": "Afficher le nombre de styles actifs pour le site actuel sur le boutton Stylus",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Afficher le nombre de styles actifs pour le site actuel sur le boutton Stylus"
 	},
 	"cm_lineWrapping": {
-		"message": "Retour à la ligne automatique",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Retour à la ligne automatique"
 	},
 	"styleCancelEditLabel": {
-		"message": "Retour à la gestion",
-		"description": "Label for cancel button for style editing"
+		"message": "Retour à la gestion"
 	},
 	"styleChangesNotSaved": {
-		"message": "Vous avez apporté des modifications à ce style sans les enregistrer.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Vous avez apporté des modifications à ce style sans les enregistrer."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Échec de la mise à jour: le serveur est inaccessible.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Échec de la mise à jour: le serveur est inaccessible."
 	},
 	"manageFilters": {
-		"message": "Filtres",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Filtres"
 	},
 	"deleteStyleConfirm": {
-		"message": "Voulez-vous vraiment supprimer ce style ?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "Voulez-vous vraiment supprimer ce style ?"
 	},
 	"styleBadRegexp": {
-		"message": "Le Regexp est éronné",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "Le Regexp est éronné"
 	},
 	"appliesDisplay": {
 		"message": "S'applique à : $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,20 +104,14 @@
 	},
 	"styleUpdate": {
 		"message": "Voulez-vous mettre à jour '$stylename$'?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"styleSectionsTitle": {
-		"message": "Sections",
-		"description": "Title for the style sections section"
-	},
 	"editStyleTitle": {
 		"message": "Modifier le style $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +119,34 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Le style est à jour.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Le style est à jour."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL commençant par",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "URL commençant par"
 	},
 	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "List styles before commands in the toolbar button menu"
 	},
 	"sectionHelp": {
-		"message": "Les sections vous permettent de définir différentes portions de code correspondant à un même style que vous pouvez appliquer à des ensembles d'URL distincts. Par exemple, un même style appliqué à la page d'accueil peut modifier celle-ci d'une certaine manière et modifier le reste du site Web d'une autre manière.",
-		"description": "Help text for sections"
+		"message": "Les sections vous permettent de définir différentes portions de code correspondant à un même style que vous pouvez appliquer à des ensembles d'URL distincts. Par exemple, un même style appliqué à la page d'accueil peut modifier celle-ci d'une certaine manière et modifier le reste du site Web d'une autre manière."
 	},
 	"noStylesForSite": {
-		"message": "Aucun style n'est installé pour ce site.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Aucun style n'est installé pour ce site."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "et bien plus encore",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "et bien plus encore"
 	},
 	"appliesRemove": {
-		"message": "Supprimer",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Supprimer"
 	},
 	"appliesLabel": {
-		"message": "S'applique à",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "S'applique à"
 	},
 	"openManage": {
-		"message": "Gérer les styles installés",
-		"description": "Link to open the manage page."
+		"message": "Gérer les styles installés"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Échec de la mise à jour: le serveur a renvoyé le code $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,139 +154,57 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Préciser",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Préciser"
 	},
 	"installUpdate": {
-		"message": "Installer la mise à jour",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Installer la mise à jour"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus ne fonctionne pas sur les pages de ce genre",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus ne fonctionne pas sur les pages de ce genre"
 	},
 	"sectionRemove": {
-		"message": "Supprimer la section",
-		"description": "Label for the button to remove a section"
+		"message": "Supprimer la section"
 	},
 	"disableAllStyles": {
-		"message": "Désactiver tous les styles",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Désactiver tous les styles"
 	},
 	"updateCompleted": {
-		"message": "Mise à jour terminée.",
-		"description": "Text that displays when an update completed"
+		"message": "Mise à jour terminée."
 	},
 	"checkingForUpdate": {
-		"message": "Vérification en cours…",
-		"description": "Text to display when checking a style for an update"
-	},
-	"sectionCode": {
-		"message": "Code",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Vérification en cours…"
 	},
 	"appliesHelp": {
-		"message": "Utilisez l'option \"S'applique à\" pour préciser les URL auxquelles le code de cette section s'applique.",
-		"description": "Help text for 'applies to' section"
+		"message": "Utilisez l'option \"S'applique à\" pour préciser les URL auxquelles le code de cette section s'applique."
 	},
 	"editStyleHeading": {
-		"message": "Modifier le style",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Modifier le style"
 	},
 	"addStyleTitle": {
-		"message": "Ajouter un style",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Ajouter un style"
 	},
 	"dbError": {
-		"message": "Une erreur s'est produite dans la base de donnée de Stylus. Voulez-vous visiter une page web avec les solutions possibles ?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Une erreur s'est produite dans la base de donnée de Stylus. Voulez-vous visiter une page web avec les solutions possibles ?"
 	},
 	"checkAllUpdates": {
-		"message": "Rechercher des mises à jour pour tous les styles",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "Rechercher des mises à jour pour tous les styles"
 	},
 	"confirmNo": {
-		"message": "Non",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Non"
 	},
 	"deleteStyleLabel": {
-		"message": "Supprimer",
-		"description": "Label for the button to delete a style"
+		"message": "Supprimer"
 	},
 	"addStyleLabel": {
-		"message": "Créer un nouveau style",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Créer un nouveau style"
 	},
 	"editStyleLabel": {
-		"message": "Modifier",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
+		"message": "Modifier"
 	},
 	"helpKeyMapCommand": {
-		"message": "Tapez un nom de commande",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Tapez un nom de commande"
 	},
 	"description": {
-		"message": "Changez l'apparence du Web grâce à Stylus, un outil de gestion des styles utilisateur. Stylus vous permet d'installer facilement des thèmes et des habillages pour Google, Facebook, YouTube, orkut et bien d'autres sites encore.",
-		"description": "Extension description"
+		"message": "Changez l'apparence du Web grâce à Stylus, un outil de gestion des styles utilisateur. Stylus vous permet d'installer facilement des thèmes et des habillages pour Google, Facebook, YouTube, orkut et bien d'autres sites encore."
 	}
 }
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 87ecf372..808c08c6 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -1,208 +1,82 @@
 {
 	"appliesToEverything": {
-		"message": "Tutto",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Tutto"
 	},
 	"enableStyleLabel": {
-		"message": "Attiva",
-		"description": "Label for the button to enable a style"
+		"message": "Attiva"
 	},
 	"styleMissingName": {
-		"message": "Inserisci un nome.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Inserisci un nome."
 	},
 	"appliesDomainOption": {
-		"message": "URL nel dominio",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL nel dominio"
 	},
 	"checkForUpdate": {
-		"message": "Verifica la presenza di aggiornamenti",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Verifica la presenza di aggiornamenti"
 	},
 	"helpAlt": {
-		"message": "Guida",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Guida"
 	},
 	"findStylesForSite": {
-		"message": "Trova più stili per questo sito",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Trova più stili per questo sito"
 	},
 	"manageHeading": {
-		"message": "Stili installati",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Stili installati"
 	},
 	"styleEnabledLabel": {
-		"message": "Attivato",
-		"description": "Label for the enabled state of styles"
+		"message": "Attivato"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Il formato Mozilla del codice può essere utilizzato con Stylish per Firefox e può essere inviato a userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Il formato Mozilla del codice può essere utilizzato con Stylish per Firefox e può essere inviato a userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Aggiungi un'altra sezione",
-		"description": "Label for the button to add a section"
+		"message": "Aggiungi un'altra sezione"
 	},
 	"styleSaveLabel": {
-		"message": "Salva",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "Salva"
 	},
 	"appliesAdd": {
-		"message": "Aggiungi",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Aggiungi"
 	},
 	"appliesRegexpOption": {
-		"message": "URL corrispondenti all'espressione regolare",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URL corrispondenti all'espressione regolare"
 	},
 	"styleInstall": {
 		"message": "Installare \"$stylename$\" in Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "Disattiva",
-		"description": "Label for the button to disable a style"
-	},
-	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Disattiva"
 	},
 	"styleCancelEditLabel": {
-		"message": "Torna a gestione",
-		"description": "Label for cancel button for style editing"
+		"message": "Torna a gestione"
 	},
 	"styleChangesNotSaved": {
-		"message": "Hai apportato modifiche a questo stile senza salvare.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Hai apportato modifiche a questo stile senza salvare."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aggiornamento non riuscito: server non raggiungibile.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Aggiornamento non riuscito: server non raggiungibile."
 	},
 	"deleteStyleConfirm": {
-		"message": "Vuoi eliminare questo stile?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "Vuoi eliminare questo stile?"
 	},
 	"appliesDisplay": {
 		"message": "Applica a: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
-		"message": "Sezioni",
-		"description": "Title for the style sections section"
+		"message": "Sezioni"
 	},
 	"editStyleTitle": {
 		"message": "Modifica dello stile $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +84,31 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Lo stile è aggiornato.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Lo stile è aggiornato."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL che iniziano con",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "URL che iniziano con"
 	},
 	"sectionHelp": {
-		"message": "Le sezioni consentono di definire diverse parti di codice da applicare a diversi insiemi di URL dello stesso stile. Ad esempio, un unico stile potrebbe modificare la home page di un sito diversamente da come modificherebbe il resto del sito.",
-		"description": "Help text for sections"
+		"message": "Le sezioni consentono di definire diverse parti di codice da applicare a diversi insiemi di URL dello stesso stile. Ad esempio, un unico stile potrebbe modificare la home page di un sito diversamente da come modificherebbe il resto del sito."
 	},
 	"noStylesForSite": {
-		"message": "Nessuno stile installato per questo sito.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Nessuno stile installato per questo sito."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "e altro ancora",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "e altro ancora"
 	},
 	"appliesRemove": {
-		"message": "Rimuovi",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Rimuovi"
 	},
 	"appliesLabel": {
-		"message": "Vale per",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Vale per"
 	},
 	"openManage": {
-		"message": "Gestisci gli stili installati",
-		"description": "Link to open the manage page."
+		"message": "Gestisci gli stili installati"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Aggiornamento non riuscito: il server ha risposto con il codice $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,135 +116,45 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specifica",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Specifica"
 	},
 	"installUpdate": {
-		"message": "Installa aggiornamento",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Installa aggiornamento"
 	},
 	"sectionRemove": {
-		"message": "Rimuovi sezione",
-		"description": "Label for the button to remove a section"
-	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Rimuovi sezione"
 	},
 	"updateCompleted": {
-		"message": "Aggiornamento completato.",
-		"description": "Text that displays when an update completed"
+		"message": "Aggiornamento completato."
 	},
 	"checkingForUpdate": {
-		"message": "Verifica in corso...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Verifica in corso..."
 	},
 	"sectionCode": {
-		"message": "Codice",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Codice"
 	},
 	"appliesHelp": {
-		"message": "Utilizza i controlli \"Applica a\" per limitare gli URL a cui viene applicato il codice in questa sezione.",
-		"description": "Help text for 'applies to' section"
+		"message": "Utilizza i controlli \"Applica a\" per limitare gli URL a cui viene applicato il codice in questa sezione."
 	},
 	"editStyleHeading": {
-		"message": "Modifica di stili",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Modifica di stili"
 	},
 	"addStyleTitle": {
-		"message": "Aggiunta di stili",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Aggiunta di stili"
 	},
 	"checkAllUpdates": {
-		"message": "Verifica la disponibilità di aggiornamenti per tutti gli stili",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Verifica la disponibilità di aggiornamenti per tutti gli stili"
 	},
 	"deleteStyleLabel": {
-		"message": "Elimina",
-		"description": "Label for the button to delete a style"
+		"message": "Elimina"
 	},
 	"addStyleLabel": {
-		"message": "Scrivi nuovo stile",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Scrivi nuovo stile"
 	},
 	"editStyleLabel": {
-		"message": "Modifica",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Modifica"
 	},
 	"description": {
-		"message": "Modifica lo stile del Web con Stylus, un gestore di stili utente. Stylus consente di installare facilmente temi e skin per Google, Facebook, YouTube, Orkut e moltissimi altri siti.",
-		"description": "Extension description"
+		"message": "Modifica lo stile del Web con Stylus, un gestore di stili utente. Stylus consente di installare facilmente temi e skin per Google, Facebook, YouTube, Orkut e moltissimi altri siti."
 	}
 }
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index 72b2571e..11baaffe 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -1,208 +1,85 @@
 {
 	"appliesToEverything": {
-		"message": "すべて",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "すべて"
 	},
 	"enableStyleLabel": {
-		"message": "有効化",
-		"description": "Label for the button to enable a style"
+		"message": "有効化"
 	},
 	"styleMissingName": {
-		"message": "名前を入力してください。",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "名前を入力してください。"
 	},
 	"appliesDomainOption": {
-		"message": "ドメイン上の URL",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "ドメイン上の URL"
 	},
 	"checkForUpdate": {
-		"message": "アップデートをチェック",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "アップデートをチェック"
 	},
 	"helpAlt": {
-		"message": "ヘルプ",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "ヘルプ"
 	},
 	"findStylesForSite": {
-		"message": "このサイト用の他のスタイルを検索",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "このサイト用の他のスタイルを検索"
 	},
 	"manageHeading": {
-		"message": "インストール済みのスタイル",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "インストール済みのスタイル"
 	},
 	"styleEnabledLabel": {
-		"message": "有効",
-		"description": "Label for the enabled state of styles"
+		"message": "有効"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla 形式のコードは、Stylish for Firefox で使用することができ、userstyles.org に投稿することができます。",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Mozilla 形式のコードは、Stylish for Firefox で使用することができ、userstyles.org に投稿することができます。"
 	},
 	"sectionAdd": {
-		"message": "他のセクションを追加",
-		"description": "Label for the button to add a section"
+		"message": "他のセクションを追加"
 	},
 	"styleSaveLabel": {
-		"message": "保存",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "保存"
 	},
 	"appliesAdd": {
-		"message": "追加",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "追加"
 	},
 	"appliesRegexpOption": {
-		"message": "正規表現に一致する URL",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "正規表現に一致する URL"
 	},
 	"styleInstall": {
 		"message": "「$stylename$」を Stylus にインストールしますか？",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "無効化",
-		"description": "Label for the button to disable a style"
-	},
-	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "無効化"
 	},
 	"styleCancelEditLabel": {
-		"message": "管理画面に戻る",
-		"description": "Label for cancel button for style editing"
+		"message": "管理画面に戻る"
 	},
 	"styleChangesNotSaved": {
-		"message": "このスタイルは変更されていますが、保存されていません。",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "このスタイルは変更されていますが、保存されていません。"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新に失敗しました: サーバーに到達できません。",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "更新に失敗しました: サーバーに到達できません。"
 	},
 	"deleteStyleConfirm": {
-		"message": "このスタイルを削除してもよろしいですか？",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "このスタイルを削除してもよろしいですか？"
 	},
 	"styleBadRegexp": {
-		"message": "正規表現は無効です。",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "正規表現は無効です。"
 	},
 	"appliesDisplay": {
 		"message": "適用先: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
-		"message": "セクション",
-		"description": "Title for the style sections section"
+		"message": "セクション"
 	},
 	"editStyleTitle": {
 		"message": "スタイル「$stylename$」を編集",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +87,31 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "スタイルは最新の状態です。",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "スタイルは最新の状態です。"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "次で始まる URL",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "次で始まる URL"
 	},
 	"sectionHelp": {
-		"message": "セクションを利用すると、1 つのスタイルの中で複数のコードを定義し、それぞれ異なる URL に適用することができます。たとえば、単一のスタイルで、サイトのトップページの表示方法と他のページの表示方法を変えることができます。",
-		"description": "Help text for sections"
+		"message": "セクションを利用すると、1 つのスタイルの中で複数のコードを定義し、それぞれ異なる URL に適用することができます。たとえば、単一のスタイルで、サイトのトップページの表示方法と他のページの表示方法を変えることができます。"
 	},
 	"noStylesForSite": {
-		"message": "このサイト用のスタイルはインストールされていません。",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "このサイト用のスタイルはインストールされていません。"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "サイトを追加",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "サイトを追加"
 	},
 	"appliesRemove": {
-		"message": "削除",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "削除"
 	},
 	"appliesLabel": {
-		"message": "適用先",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "適用先"
 	},
 	"openManage": {
-		"message": "インストール済みのスタイルを管理",
-		"description": "Link to open the manage page."
+		"message": "インストール済みのスタイルを管理"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "更新に失敗しました: サーバーが応答コード「$code$」を返しています。",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,135 +119,45 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "個別指定",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "個別指定"
 	},
 	"installUpdate": {
-		"message": "アップデートをインストール",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "アップデートをインストール"
 	},
 	"sectionRemove": {
-		"message": "セクションを削除",
-		"description": "Label for the button to remove a section"
-	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "セクションを削除"
 	},
 	"updateCompleted": {
-		"message": "更新が完了しました",
-		"description": "Text that displays when an update completed"
+		"message": "更新が完了しました"
 	},
 	"checkingForUpdate": {
-		"message": "チェック中...",
-		"description": "Text to display when checking a style for an update"
+		"message": "チェック中..."
 	},
 	"sectionCode": {
-		"message": "コード",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "コード"
 	},
 	"appliesHelp": {
-		"message": "[適用先] を使用すると、このセクションのコードが適用される URL を制限することができます。",
-		"description": "Help text for 'applies to' section"
+		"message": "[適用先] を使用すると、このセクションのコードが適用される URL を制限することができます。"
 	},
 	"editStyleHeading": {
-		"message": "スタイルを編集",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "スタイルを編集"
 	},
 	"addStyleTitle": {
-		"message": "スタイルを追加",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "スタイルを追加"
 	},
 	"checkAllUpdates": {
-		"message": "すべてのスタイルのアップデートをチェック",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "すべてのスタイルのアップデートをチェック"
 	},
 	"deleteStyleLabel": {
-		"message": "削除",
-		"description": "Label for the button to delete a style"
+		"message": "削除"
 	},
 	"addStyleLabel": {
-		"message": "新しいスタイルを作成",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "新しいスタイルを作成"
 	},
 	"editStyleLabel": {
-		"message": "編集",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "編集"
 	},
 	"description": {
-		"message": "Stylus はユーザー スタイルを管理するツールで、ウェブのスタイルを変更することができます。Stylus を利用すると、Google、Facebook、YouTube、orkut など、さまざまなサイトに対応したテーマやスキンを簡単にインストールできます。",
-		"description": "Extension description"
+		"message": "Stylus はユーザー スタイルを管理するツールで、ウェブのスタイルを変更することができます。Stylus を利用すると、Google、Facebook、YouTube、orkut など、さまざまなサイトに対応したテーマやスキンを簡単にインストールできます。"
 	}
 }
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index 9bc07767..e606a10c 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -1,111 +1,84 @@
 {
 	"appliesToEverything": {
-		"message": "Alles",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "Alles"
 	},
 	"defaultTheme": {
-		"message": "standaard",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "standaard"
 	},
 	"exportLabel": {
-		"message": "Exporteren",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+		"message": "Exporteren"
 	},
 	"issues": {
-		"message": "Problemen",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Problemen"
 	},
 	"cm_tabSize": {
-		"message": "Tabgrootte",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Tabgrootte"
 	},
 	"enableStyleLabel": {
-		"message": "Inschakelen",
-		"description": "Label for the button to enable a style"
+		"message": "Inschakelen"
 	},
 	"styleMissingName": {
-		"message": "Vul een naam in.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Vul een naam in."
 	},
 	"appliesDomainOption": {
-		"message": "URL's op het domein",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL's op het domein"
 	},
 	"checkForUpdate": {
-		"message": "Controleren op update",
-		"description": "Label for the button to check a single style for an update"
+		"message": "Controleren op update"
 	},
 	"importAppendLabel": {
-		"message": "Toevoegen aan stijl",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Toevoegen aan stijl"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Alle stijlen zijn bijgewerkt.",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "Alle stijlen zijn bijgewerkt."
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Plak de Mozilla-opmaakcode",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Plak de Mozilla-opmaakcode"
 	},
 	"helpAlt": {
-		"message": "Hul",
-		"description": "Alternate text for help buttons"
+		"message": "Hul"
 	},
 	"search": {
-		"message": "Zoeken",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "Zoeken"
 	},
 	"confirmYes": {
-		"message": "Ja",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Ja"
 	},
 	"findStylesForSite": {
-		"message": "Meer stijlen zoeken voor deze website",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Meer stijlen zoeken voor deze website"
 	},
 	"manageHeading": {
-		"message": "Geïnstalleerde stijlen",
-		"description": "Heading for the manage page"
+		"message": "Geïnstalleerde stijlen"
 	},
 	"styleBeautify": {
-		"message": "Mooier maken",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Mooier maken"
 	},
 	"styleEnabledLabel": {
-		"message": "Ingeschakeld",
-		"description": "Label for the enabled state of styles"
+		"message": "Ingeschakeld"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "De Mozilla-opmaak van de code kan worden gebruikt met Stylish voor Firefox en worden ingezonden naar userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "De Mozilla-opmaak van de code kan worden gebruikt met Stylish voor Firefox en worden ingezonden naar userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Nog een sectie toevoegen",
-		"description": "Label for the button to add a section"
+		"message": "Nog een sectie toevoegen"
 	},
 	"styleSaveLabel": {
-		"message": "Opslaan",
-		"description": "Label for save button for style editing"
+		"message": "Opslaan"
 	},
 	"confirmStop": {
-		"message": "Stoppen",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Stoppen"
 	},
 	"writeStyleForURL": {
-		"message": "deze URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "deze URL"
 	},
 	"appliesAdd": {
-		"message": "Toevoegen",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Toevoegen"
 	},
 	"appliesRegexpOption": {
-		"message": "URL's overeenkomend met de regexp",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URL's overeenkomend met de regexp"
 	},
 	"styleInstall": {
 		"message": "'$stylename$' installeren in Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -113,74 +86,49 @@
 		}
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Verkrijg stijlen op userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Verkrijg hulp</a>",
-		"description": "Help text on the manage page"
+		"message": "<a href='https://userstyles.org'>Verkrijg stijlen op userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Verkrijg hulp</a>"
 	},
 	"searchStyles": {
-		"message": "Inhoud doorzoeken",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "Inhoud doorzoeken"
 	},
 	"disableStyleLabel": {
-		"message": "Uitschakelen",
-		"description": "Label for the button to disable a style"
+		"message": "Uitschakelen"
 	},
 	"prefShowBadge": {
-		"message": "Aantal actieve stijlen voor de huidige website weergeven op de werkbalkknop",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Aantal actieve stijlen voor de huidige website weergeven op de werkbalkknop"
 	},
 	"menuShowBadge": {
-		"message": "Teller voor actieve stijlen weergeven",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Teller voor actieve stijlen weergeven"
 	},
 	"cm_lineWrapping": {
-		"message": "Woordomslag",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Woordomslag"
 	},
 	"styleCancelEditLabel": {
-		"message": "Terug naar beheren",
-		"description": "Label for cancel button for style editing"
+		"message": "Terug naar beheren"
 	},
 	"styleChangesNotSaved": {
-		"message": "U heeft wijzigingen aangebracht in deze stijl zonder deze op te slaan.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+		"message": "U heeft wijzigingen aangebracht in deze stijl zonder deze op te slaan."
 	},
 	"importLabel": {
-		"message": "Importeren",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Importeren"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Update mislukt: server onbereikbaar.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
+		"message": "Update mislukt: server onbereikbaar."
 	},
 	"applyAllUpdates": {
-		"message": "Alle bijwerkingen toepassen",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Alle bijwerkingen toepassen"
 	},
 	"deleteStyleConfirm": {
-		"message": "Weet u zeker dat u deze stijl wilt verwijderen?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "Weet u zeker dat u deze stijl wilt verwijderen?"
 	},
 	"styleBadRegexp": {
-		"message": "Regexp is ongeldig.",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "Regexp is ongeldig."
 	},
 	"optionsHeading": {
-		"message": "Voorkeuren",
-		"description": "Heading for options section on manage page."
+		"message": "Voorkeuren"
 	},
 	"appliesDisplay": {
 		"message": "Toepasbaar op: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,7 +137,6 @@
 	},
 	"styleUpdate": {
 		"message": "Weet u zeker dat u '$stylename$' wilt updaten?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -197,12 +144,10 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Secties",
-		"description": "Title for the style sections section"
+		"message": "Secties"
 	},
 	"editStyleTitle": {
 		"message": "Stijl $stylename$ bewerken",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +155,49 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Stijl is up-to-date.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Stijl is up-to-date."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL's beginnend met",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
+		"message": "URL's beginnend met"
 	},
 	"searchRegexp": {
-		"message": "Gebruik /re/-syntax voor regexp-zoeken",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
+		"message": "Gebruik /re/-syntax voor regexp-zoeken"
 	},
 	"importReplaceTooltip": {
-		"message": "Verwerp de inhoud van de huidige stijl en overschrijf het met de geïmporteerde stijl",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Verwerp de inhoud van de huidige stijl en overschrijf het met de geïmporteerde stijl"
 	},
 	"popupStylesFirst": {
-		"message": "Stijlen vóór commando's opsomming in het werkbalkknopmenu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "Stijlen vóór commando's opsomming in het werkbalkknopmenu"
 	},
 	"sectionHelp": {
-		"message": "Secties stellen u in staat om andere stukken code toe te passen op andere URL's in dezelfde stijl. Bijv.: een enkele stijl kan de homepage van een site aanpassen op een bepaalde manier, terwijl de rest van de site op een andere manier wordt aangepast.",
-		"description": "Help text for sections"
+		"message": "Secties stellen u in staat om andere stukken code toe te passen op andere URL's in dezelfde stijl. Bijv.: een enkele stijl kan de homepage van een site aanpassen op een bepaalde manier, terwijl de rest van de site op een andere manier wordt aangepast."
 	},
 	"noStylesForSite": {
-		"message": "Geen geïnstalleerde stijlen voor deze website.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Geen geïnstalleerde stijlen voor deze website."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "en meer",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "en meer"
 	},
 	"appliesRemove": {
-		"message": "Verwijderen",
-		"description": "Label for the button to remove an 'applies' entry"
+		"message": "Verwijderen"
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Stijl in Mozilla-opmaak",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Stijl in Mozilla-opmaak"
 	},
 	"writeStyleFor": {
-		"message": "Stijl schrijven voor:",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+		"message": "Stijl schrijven voor:"
 	},
 	"replace": {
-		"message": "Vervangen",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Vervangen"
 	},
 	"appliesLabel": {
-		"message": "Toepasbaar op",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Toepasbaar op"
 	},
 	"openManage": {
-		"message": "Geïnstalleerde stijlen beheren",
-		"description": "Link to open the manage page."
+		"message": "Geïnstalleerde stijlen beheren"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Update mislukt: server gaf code $code$ als antwoord.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,143 +205,102 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specificeren",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Specificeren"
 	},
 	"installUpdate": {
-		"message": "Update installeren",
-		"description": "Label for the button to install an update for a single style"
+		"message": "Update installeren"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla-opmaak",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Mozilla-opmaak"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus werkt niet op pagina's als deze.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus werkt niet op pagina's als deze."
 	},
 	"sectionRemove": {
-		"message": "Sectie verwijderen",
-		"description": "Label for the button to remove a section"
+		"message": "Sectie verwijderen"
 	},
 	"disableAllStyles": {
-		"message": "Alle stijlen uitschakelen",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Alle stijlen uitschakelen"
 	},
 	"undoGlobal": {
-		"message": "Ongedaan maken (globaal)",
-		"description": "CSS-beautify global Undo button label"
+		"message": "Ongedaan maken (globaal)"
 	},
 	"updateCompleted": {
-		"message": "Update voltooid.",
-		"description": "Text that displays when an update completed"
+		"message": "Update voltooid."
 	},
 	"checkingForUpdate": {
-		"message": "Bezig met controleren...",
-		"description": "Text to display when checking a style for an update"
-	},
-	"sectionCode": {
-		"message": "Code",
-		"description": "Label for the code for a section"
+		"message": "Bezig met controleren..."
 	},
 	"cm_smartIndent": {
-		"message": "Slimme inspringing gebruiken",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Slimme inspringing gebruiken"
 	},
 	"appliesHelp": {
-		"message": "Gebruik de 'Toepasbaar op'-functies om de URL's te limiteren in de sectie.",
-		"description": "Help text for 'applies to' section"
+		"message": "Gebruik de 'Toepasbaar op'-functies om de URL's te limiteren in de sectie."
 	},
 	"editStyleHeading": {
-		"message": "Stijl bewerken",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Stijl bewerken"
 	},
 	"addStyleTitle": {
-		"message": "Stijl toevoegen",
-		"description": "Title of the page for adding styles"
+		"message": "Stijl toevoegen"
 	},
 	"importReplaceLabel": {
-		"message": "Stijl overschrijven",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Stijl overschrijven"
 	},
 	"dbError": {
-		"message": "Er is een fout opgetreden bij het gebruiken van de Stylus-database. Wilt u een webpagina met mogelijke oplossingen bezoeken?",
-		"description": "Prompt when a DB error is encountered"
+		"message": "Er is een fout opgetreden bij het gebruiken van de Stylus-database. Wilt u een webpagina met mogelijke oplossingen bezoeken?"
 	},
 	"importAppendTooltip": {
-		"message": "Voeg de geïmporteerde stijl toe aan de huidige stijl",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
+		"message": "Voeg de geïmporteerde stijl toe aan de huidige stijl"
 	},
 	"helpKeyMapHotkey": {
-		"message": "Druk op een sneltoets",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Druk op een sneltoets"
 	},
 	"replaceAll": {
-		"message": "Alles vervangen",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Alles vervangen"
 	},
 	"editGotoLine": {
-		"message": "Ga naar regel (of regel:kolom)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Ga naar regel (of regel:kolom)"
 	},
 	"checkAllUpdates": {
-		"message": "Controleer alle stijlen op updates",
-		"description": "Label for the button to check all styles for updates"
+		"message": "Controleer alle stijlen op updates"
 	},
 	"issuesHelp": {
-		"message": "De door CSSLint gevonden problemen, <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>, met deze ingeschakelde regels:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "De door CSSLint gevonden problemen, <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>, met deze ingeschakelde regels:"
 	},
 	"confirmNo": {
-		"message": "Nee",
-		"description": "'No' button in a confirm dialog"
+		"message": "Nee"
 	},
 	"undo": {
-		"message": "Ongedaan maken",
-		"description": "Button label"
+		"message": "Ongedaan maken"
 	},
 	"cm_keyMap": {
-		"message": "Toetsenbordindeling",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Toetsenbordindeling"
 	},
 	"cm_indentWithTabs": {
-		"message": "Tabs met slimme inspringing gebruiken",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+		"message": "Tabs met slimme inspringing gebruiken"
 	},
 	"replaceWith": {
-		"message": "Vervangen door",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Vervangen door"
 	},
 	"deleteStyleLabel": {
-		"message": "Verwijderen",
-		"description": "Label for the button to delete a style"
+		"message": "Verwijderen"
 	},
 	"addStyleLabel": {
-		"message": "Nieuwe stijl schrijven",
-		"description": "Label for the button to go to the add style page"
+		"message": "Nieuwe stijl schrijven"
 	},
 	"manageOnlyEnabled": {
-		"message": "Alleen ingeschakelde stijlen",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Alleen ingeschakelde stijlen"
 	},
 	"editStyleLabel": {
-		"message": "Bewerken",
-		"description": "Label for the button to go to the edit style page"
+		"message": "Bewerken"
 	},
 	"cm_theme": {
-		"message": "Thema",
-		"description": "Label for the style editor's CSS theme."
+		"message": "Thema"
 	},
 	"helpKeyMapCommand": {
-		"message": "Voer een naam in voor het commando",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Voer een naam in voor het commando"
 	},
 	"description": {
-		"message": "Voorzie het web van een ander uiterlijk met Stylus, een gebruikersstijlbeheerder. Stylus stelt u in staat om eenvoudig thema's en stijlen te installeren voor vele populaire websites.",
-		"description": "Extension description"
+		"message": "Voorzie het web van een ander uiterlijk met Stylus, een gebruikersstijlbeheerder. Stylus stelt u in staat om eenvoudig thema's en stijlen te installeren voor vele populaire websites."
 	}
 }
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index d36633c5..29ef8b34 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -1,208 +1,85 @@
 {
 	"appliesToEverything": {
-		"message": "Tudo",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Tudo"
 	},
 	"enableStyleLabel": {
-		"message": "Ativar",
-		"description": "Label for the button to enable a style"
+		"message": "Ativar"
 	},
 	"styleMissingName": {
-		"message": "Insira um nome.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Insira um nome."
 	},
 	"appliesDomainOption": {
-		"message": "URLs no domínio",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URLs no domínio"
 	},
 	"checkForUpdate": {
-		"message": "Verificar atualizações",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Verificar atualizações"
 	},
 	"helpAlt": {
-		"message": "Ajuda",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Ajuda"
 	},
 	"findStylesForSite": {
-		"message": "Procurar mais estilos para este site",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Procurar mais estilos para este site"
 	},
 	"manageHeading": {
-		"message": "Estilos instalados",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Estilos instalados"
 	},
 	"styleEnabledLabel": {
-		"message": "Ativado",
-		"description": "Label for the enabled state of styles"
+		"message": "Ativado"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "O formato Mozilla do código pode ser usado com o Stylish para Firefox e pode ser enviado para userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "O formato Mozilla do código pode ser usado com o Stylish para Firefox e pode ser enviado para userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Adicionar outra seção",
-		"description": "Label for the button to add a section"
+		"message": "Adicionar outra seção"
 	},
 	"styleSaveLabel": {
-		"message": "Salvar",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "Salvar"
 	},
 	"appliesAdd": {
-		"message": "Adicionar",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Adicionar"
 	},
 	"appliesRegexpOption": {
-		"message": "URLs que correspondem a regexp",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URLs que correspondem a regexp"
 	},
 	"styleInstall": {
 		"message": "Instalar \"$stylename$\" no Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "Desativar",
-		"description": "Label for the button to disable a style"
+		"message": "Desativar"
 	},
 	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Show number of styles active for the current site on the toolbar button"
 	},
 	"styleCancelEditLabel": {
-		"message": "Voltar ao gerenciamento",
-		"description": "Label for cancel button for style editing"
+		"message": "Voltar ao gerenciamento"
 	},
 	"styleChangesNotSaved": {
-		"message": "Você fez alterações neste estilo sem salvar.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Você fez alterações neste estilo sem salvar."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "A atualização falhou: servidor inacessível.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "A atualização falhou: servidor inacessível."
 	},
 	"deleteStyleConfirm": {
-		"message": "Tem certeza de que deseja excluir este estilo?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "Tem certeza de que deseja excluir este estilo?"
 	},
 	"appliesDisplay": {
 		"message": "Aplica-se a: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
-		"message": "Seções",
-		"description": "Title for the style sections section"
+		"message": "Seções"
 	},
 	"editStyleTitle": {
 		"message": "Editar estilo $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +87,31 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "O estilo está atualizado.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "O estilo está atualizado."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URLs que começam com",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "URLs que começam com"
 	},
 	"sectionHelp": {
-		"message": "As seções permitem definir diferentes partes de código para aplicar a diferentes conjuntos de URLs no mesmo estilo. Por exemplo, um único estilo poderia alterar a página inicial de um site de uma forma, enquanto alteraria o resto do site de outra forma.",
-		"description": "Help text for sections"
+		"message": "As seções permitem definir diferentes partes de código para aplicar a diferentes conjuntos de URLs no mesmo estilo. Por exemplo, um único estilo poderia alterar a página inicial de um site de uma forma, enquanto alteraria o resto do site de outra forma."
 	},
 	"noStylesForSite": {
-		"message": "Nenhum estilo instalado para este site.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Nenhum estilo instalado para este site."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "e mais",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "e mais"
 	},
 	"appliesRemove": {
-		"message": "Remover",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Remover"
 	},
 	"appliesLabel": {
-		"message": "Aplica-se a",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Aplica-se a"
 	},
 	"openManage": {
-		"message": "Gerenciar estilos instalados",
-		"description": "Link to open the manage page."
+		"message": "Gerenciar estilos instalados"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "A atualização falhou: o  servidor respondeu com código $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,135 +119,45 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Especificar",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Especificar"
 	},
 	"installUpdate": {
-		"message": "Instalar atualização",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Instalar atualização"
 	},
 	"sectionRemove": {
-		"message": "Remover seção",
-		"description": "Label for the button to remove a section"
-	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Remover seção"
 	},
 	"updateCompleted": {
-		"message": "Atualização concluída.",
-		"description": "Text that displays when an update completed"
+		"message": "Atualização concluída."
 	},
 	"checkingForUpdate": {
-		"message": "Verificando...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Verificando..."
 	},
 	"sectionCode": {
-		"message": "Código",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Código"
 	},
 	"appliesHelp": {
-		"message": "Use os controles \"Aplica-se a\" para limitar a quais URLs o código desta seção se aplica.",
-		"description": "Help text for 'applies to' section"
+		"message": "Use os controles \"Aplica-se a\" para limitar a quais URLs o código desta seção se aplica."
 	},
 	"editStyleHeading": {
-		"message": "Editar estilo",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Editar estilo"
 	},
 	"addStyleTitle": {
-		"message": "Adicionar estilo",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Adicionar estilo"
 	},
 	"checkAllUpdates": {
-		"message": "Verificar atualizações para todos os estilos",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Verificar atualizações para todos os estilos"
 	},
 	"deleteStyleLabel": {
-		"message": "Excluir",
-		"description": "Label for the button to delete a style"
+		"message": "Excluir"
 	},
 	"addStyleLabel": {
-		"message": "Gravar novo estilo",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Gravar novo estilo"
 	},
 	"editStyleLabel": {
-		"message": "Editar",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Editar"
 	},
 	"description": {
-		"message": "Mude o estilo da web com o Stylus, um gerenciador de estilos do usuário. O Stylus permite instalar facilmente temas e skins para Google, Facebook, YouTube, Orkut e muitos, muitos outros sites.",
-		"description": "Extension description"
+		"message": "Mude o estilo da web com o Stylus, um gerenciador de estilos do usuário. O Stylus permite instalar facilmente temas e skins para Google, Facebook, YouTube, Orkut e muitos, muitos outros sites."
 	}
 }
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index 74cae21f..718d1d4a 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -1,199 +1,150 @@
 {
 	"appliesToEverything": {
-		"message": "Все",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "Все"
 	},
 	"defaultTheme": {
-		"message": "по-умолчанию",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "по-умолчанию"
 	},
 	"styleRegexpTestTitle": {
-		"message": "Список соответствующих вкладок (щелкните на адресе, чтобы активировать)",
-		"description": "RegExp test report: title of the report"
+		"message": "Список соответствующих вкладок (щелкните на адресе, чтобы активировать)"
 	},
 	"bckpInstStyles": {
-		"message": "Экспорт стилей",
-		"description": ""
+		"message": "Экспорт стилей"
 	},
 	"optionsUpdateInterval": {
-		"message": "Автоматически проверять и устанавливать обновления стилей (интервал в часах)",
-		"description": ""
+		"message": "Автоматически проверять и устанавливать обновления стилей (интервал в часах)"
 	},
 	"exportLabel": {
-		"message": "Экспорт",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+		"message": "Экспорт"
 	},
 	"issues": {
-		"message": "Проблемы",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Проблемы"
 	},
 	"optionsBadgeNormal": {
-		"message": "Цвет фона",
-		"description": ""
+		"message": "Цвет фона"
 	},
 	"updateCheckHistory": {
-		"message": "История проверок обновлений",
-		"description": ""
+		"message": "История проверок обновлений"
 	},
 	"cm_tabSize": {
-		"message": "Размер табуляции",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Размер табуляции"
 	},
 	"enableStyleLabel": {
-		"message": "Включить",
-		"description": "Label for the button to enable a style"
+		"message": "Включить"
 	},
 	"styleMissingName": {
-		"message": "Введите название.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Введите название."
 	},
 	"genericHistoryLabel": {
-		"message": "История",
-		"description": "Used in various places to show a history log of something"
+		"message": "История"
 	},
 	"shortcutsNote": {
-		"message": "Назначить клавишу",
-		"description": ""
+		"message": "Назначить клавишу"
 	},
 	"appliesDomainOption": {
-		"message": "URL в домене",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL в домене"
 	},
 	"checkForUpdate": {
-		"message": "Проверить обновление",
-		"description": "Label for the button to check a single style for an update"
+		"message": "Проверить обновление"
 	},
 	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Стиль не был применен из-за некорректного regexp()",
-		"description": "Tooltip in the popup for styles that were not applied at all"
+		"message": "Стиль не был применен из-за некорректного regexp()"
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "Некоторые 'regexp()' выражения не удалось скомпилировать.",
-		"description": ""
+		"message": "Некоторые 'regexp()' выражения не удалось скомпилировать."
 	},
 	"importAppendLabel": {
-		"message": "Добавить к стилю",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Добавить к стилю"
 	},
 	"optionsOpenManager": {
-		"message": "Менеджер стилей",
-		"description": ""
+		"message": "Менеджер стилей"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Обновлений нет.",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "Обновлений нет."
 	},
 	"importReportLegendAdded": {
-		"message": "добавлено",
-		"description": "Text after the number of styles added in the report shown after importing styles"
+		"message": "добавлено"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Вставьте содержимое стиля в формате Mozilla",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Вставьте содержимое стиля в формате Mozilla"
 	},
 	"dragDropMessage": {
-		"message": "Перетащите файл с резервной копией стилей в любое место этой страницы, чтобы импортировать его.",
-		"description": "Drag'n'drop message"
+		"message": "Перетащите файл с резервной копией стилей в любое место этой страницы, чтобы импортировать его."
 	},
 	"helpAlt": {
-		"message": "Справка",
-		"description": "Alternate text for help buttons"
+		"message": "Справка"
 	},
 	"confirmOK": {
-		"message": "ОК",
-		"description": ""
+		"message": "ОК"
 	},
 	"search": {
-		"message": "Искать",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "Искать"
 	},
 	"manageFaviconsGray": {
-		"message": "Обесцвечивать",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+		"message": "Обесцвечивать"
 	},
 	"confirmYes": {
-		"message": "Да",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Да"
 	},
 	"findStylesForSite": {
-		"message": "Найти еще стили для этого веб-сайта",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Найти еще стили для этого веб-сайта"
 	},
 	"manageHeading": {
-		"message": "Установленные стили",
-		"description": "Heading for the manage page"
+		"message": "Установленные стили"
 	},
 	"styleBeautify": {
-		"message": "Форматировать",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Форматировать"
 	},
 	"styleRegexpProblemTooltip": {
-		"message": "Кол-во пропущенных секций из-за неправильного regexp()",
-		"description": "Tooltip in the popup for styles that were applied only partially"
+		"message": "Кол-во пропущенных секций из-за неправильного regexp()"
 	},
 	"styleEnabledLabel": {
-		"message": "Включено",
-		"description": "Label for the enabled state of styles"
+		"message": "Включено"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Формат кода Mozilla можно отправлять на сайт userstyles.org и использовать в дополнении Stylish для Firefox.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Формат кода Mozilla можно отправлять на сайт userstyles.org и использовать в дополнении Stylish для Firefox."
 	},
 	"sectionAdd": {
-		"message": "Добавить раздел",
-		"description": "Label for the button to add a section"
+		"message": "Добавить раздел"
 	},
 	"styleRegexpTestPartial": {
-		"message": "Не применено, т.к. соответствие не полное",
-		"description": "RegExp test report: label for the partially matching expressions"
+		"message": "Не применено, т.к. соответствие не полное"
 	},
 	"styleSaveLabel": {
-		"message": "Сохранить",
-		"description": "Label for save button for style editing"
+		"message": "Сохранить"
 	},
 	"confirmDelete": {
-		"message": "Удалить",
-		"description": ""
+		"message": "Удалить"
 	},
 	"confirmCancel": {
-		"message": "Отмена",
-		"description": ""
+		"message": "Отмена"
 	},
 	"retrieveBckp": {
-		"message": "Импорт стилей",
-		"description": ""
+		"message": "Импорт стилей"
 	},
 	"confirmStop": {
-		"message": "Стоп",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Стоп"
 	},
 	"writeStyleForURL": {
-		"message": "этого адреса",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "этого адреса"
 	},
 	"optionsSubheading": {
-		"message": "Дополнительно",
-		"description": "Subheading for options section on manage page."
+		"message": "Дополнительно"
 	},
 	"appliesAdd": {
-		"message": "Добавить",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Добавить"
 	},
 	"appliesRegexpOption": {
-		"message": "URL, соответствующим регулярному выражению",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URL, соответствующим регулярному выражению"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "Позволяет писать CSS, работающий только внутри iframe, например: html[stylus-iframe] h1 { display:none }",
-		"description": ""
+		"message": "Позволяет писать CSS, работающий только внутри iframe, например: html[stylus-iframe] h1 { display:none }"
 	},
 	"importReportLegendUpdatedCode": {
-		"message": "обновлен код",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
+		"message": "обновлен код"
 	},
 	"styleInstall": {
 		"message": "Установить \"$stylename$\" в Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -201,112 +152,85 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "Цвет фона в неактивном состоянии",
-		"description": ""
+		"message": "Цвет фона в неактивном состоянии"
 	},
 	"optionsCheck": {
-		"message": "Обновить стили",
-		"description": ""
+		"message": "Обновить стили"
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Скачать стили с userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Справка</a>",
-		"description": "Help text on the manage page"
+		"message": "<a href='https://userstyles.org'>Скачать стили с userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Справка</a>"
 	},
 	"manageOnlyLocal": {
-		"message": "Только локально созданные стили",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+		"message": "Только локально созданные стили"
 	},
 	"searchStyles": {
-		"message": "Искать по содержимому",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "Искать по содержимому"
 	},
 	"optionsUpdateImportNote": {
-		"message": "После импорта базы стилей из старой версии или из Stylish запустите проверку на обновления из менеджера стилей, чтобы удостовериться в обновлении всех стилей.",
-		"description": ""
+		"message": "После импорта базы стилей из старой версии или из Stylish запустите проверку на обновления из менеджера стилей, чтобы удостовериться в обновлении всех стилей."
 	},
 	"checkAllUpdatesForce": {
-		"message": "Я не менял стили, проверить заново!",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Я не менял стили, проверить заново!"
 	},
 	"unreachableFileHint": {
-		"message": "Доступ к адресам file:// возможен только если включить соответствующую опцию для Stylus на странице chrome://extensions.",
-		"description": "Note in the toolbar popup for file:// URLs"
+		"message": "Доступ к адресам file:// возможен только если включить соответствующую опцию для Stylus на странице chrome://extensions."
 	},
 	"disableStyleLabel": {
-		"message": "Отключить",
-		"description": "Label for the button to disable a style"
+		"message": "Отключить"
 	},
 	"prefShowBadge": {
-		"message": "Показывать количество активных стилей для открытого сайта",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Показывать количество активных стилей для открытого сайта"
 	},
 	"manageFavicons": {
-		"message": "Пиктограммы для целевых сайтов",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+		"message": "Пиктограммы для целевых сайтов"
 	},
 	"menuShowBadge": {
-		"message": "Число активных стилей",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Число активных стилей"
 	},
 	"cm_lineWrapping": {
-		"message": "Перенос по словам",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Перенос по словам"
 	},
 	"styleCancelEditLabel": {
-		"message": "Завершить",
-		"description": "Label for cancel button for style editing"
+		"message": "Завершить"
 	},
 	"styleChangesNotSaved": {
-		"message": "Вы изменили этот стиль, но не сохранили его.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+		"message": "Вы изменили этот стиль, но не сохранили его."
 	},
 	"importLabel": {
-		"message": "Импорт",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Импорт"
 	},
 	"shortcuts": {
-		"message": "Клавиши",
-		"description": "Go to shortcut configuration"
+		"message": "Клавиши"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Ошибка обновления: сервер недоступен.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Ошибка обновления: сервер недоступен."
 	},
 	"manageFilters": {
-		"message": "Фильтры",
-		"description": "Label for filters container"
+		"message": "Фильтры"
 	},
 	"applyAllUpdates": {
-		"message": "Применить все обновления",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Применить все обновления"
 	},
 	"optionsReset": {
-		"message": "Сброс настроек к значениям по-умолчанию",
-		"description": ""
+		"message": "Сброс настроек к значениям по-умолчанию"
 	},
 	"optionsCustomizeUpdate": {
-		"message": "Обновления",
-		"description": ""
+		"message": "Обновления"
 	},
 	"deleteStyleConfirm": {
-		"message": "Удалить этот стиль?",
-		"description": "Confirmation before deleting a style"
+		"message": "Удалить этот стиль?"
 	},
 	"optionsCustomizePopup": {
-		"message": "Всплывающее окно",
-		"description": ""
+		"message": "Всплывающее окно"
 	},
 	"styleBadRegexp": {
-		"message": "Ошибка в регулярном выражении.",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "Ошибка в регулярном выражении."
 	},
 	"optionsHeading": {
-		"message": "Настройки",
-		"description": "Heading for options section on manage page."
+		"message": "Настройки"
 	},
 	"appliesDisplay": {
 		"message": "Применить к: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -314,12 +238,10 @@
 		}
 	},
 	"openStylesManager": {
-		"message": "Менеджер стилей",
-		"description": "Label for the style maanger opener in the browser action context menu."
+		"message": "Менеджер стилей"
 	},
 	"styleUpdate": {
 		"message": "Подтвердите обновление стиля '$stylename$'.",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -327,16 +249,13 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Разделы",
-		"description": "Title for the style sections section"
+		"message": "Разделы"
 	},
 	"importReportLegendInvalid": {
-		"message": "некорректных пропущено",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
+		"message": "некорректных пропущено"
 	},
 	"editStyleTitle": {
 		"message": "Изменение стиля \"$stylename$\"",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -344,96 +263,70 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Нет обновлений.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Нет обновлений."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL, начинающимся с",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
+		"message": "URL, начинающимся с"
 	},
 	"cm_matchHighlightToken": {
-		"message": "Элемент под курсором",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+		"message": "Элемент под курсором"
 	},
 	"searchRegexp": {
-		"message": "Используйте нотацию /re/ для поиска регулярными выражениями",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
+		"message": "Используйте нотацию /re/ для поиска регулярными выражениями"
 	},
 	"updateCheckManualUpdateHint": {
-		"message": "Форсирование обновления удалит локальные изменения.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Форсирование обновления удалит локальные изменения."
 	},
 	"toggleStyle": {
-		"message": "Включить/выключить стиль",
-		"description": "Label for the checkbox to enable/disable a style"
+		"message": "Включить/выключить стиль"
 	},
 	"importReplaceTooltip": {
-		"message": "Удалить содержимое редактируемого стиля и заменить его на импортируемый стиль",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Удалить содержимое редактируемого стиля и заменить его на импортируемый стиль"
 	},
 	"popupStylesFirst": {
-		"message": "Список стилей сверху",
-		"description": "Label for the checkbox controlling section order in the popup."
+		"message": "Список стилей сверху"
 	},
 	"sectionHelp": {
-		"message": "Разделы позволяют задавать разный код для различных наборов URL в пределах одного стиля. Например, стиль может применяться к главной странице не так, как к остальным частям сайта.",
-		"description": "Help text for sections"
+		"message": "Разделы позволяют задавать разный код для различных наборов URL в пределах одного стиля. Например, стиль может применяться к главной странице не так, как к остальным частям сайта."
 	},
 	"noStylesForSite": {
-		"message": "Для этого веб-сайта не установлено ни одного стиля.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Для этого веб-сайта не установлено ни одного стиля."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "и другие",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "и другие"
 	},
 	"appliesRemove": {
-		"message": "Удалить",
-		"description": "Label for the button to remove an 'applies' entry"
+		"message": "Удалить"
 	},
 	"updatesCurrentlyInstalled": {
-		"message": "Установлено обновлений:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+		"message": "Установлено обновлений:"
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Стиль в формате Mozilla",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Стиль в формате Mozilla"
 	},
 	"writeStyleFor": {
-		"message": "Создать стиль для:",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+		"message": "Создать стиль для:"
 	},
 	"replace": {
-		"message": "Заменить",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Заменить"
 	},
 	"styleRegexpTestNone": {
-		"message": "Нет соответствующих вкладок",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
+		"message": "Нет соответствующих вкладок"
 	},
 	"importReportLegendUpdatedMeta": {
-		"message": "обновлены мета-данные",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
+		"message": "обновлены мета-данные"
 	},
 	"appliesLabel": {
-		"message": "Применить к:",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Применить к:"
 	},
 	"openOptionsPopup": {
-		"message": "Настройки",
-		"description": "Go to Options UI"
+		"message": "Настройки"
 	},
 	"openManage": {
-		"message": "Менеджер",
-		"description": "Link to open the manage page."
+		"message": "Менеджер"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Ошибка обновления: сервер вернул код $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -441,295 +334,219 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Указать",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Указать"
 	},
 	"installUpdate": {
-		"message": "Установить обновление",
-		"description": "Label for the button to install an update for a single style"
+		"message": "Установить обновление"
 	},
 	"optionsCheckUpdate": {
-		"message": "Найти и установить обновления стилей",
-		"description": ""
+		"message": "Найти и установить обновления стилей"
 	},
 	"importReportTitle": {
-		"message": "Импорт стилей завершен",
-		"description": "Title of the report shown after importing styles"
+		"message": "Импорт стилей завершен"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Формат Mozilla",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Формат Mozilla"
 	},
 	"cm_matchHighlight": {
-		"message": "Подсвечивать",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+		"message": "Подсвечивать"
 	},
 	"styleRegexpPartialExplanation": {
-		"message": "В стиле используются regexp-выражения, которые соответствуют лишь части адреса, что нарушает <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>спецификацию CSS4 @document</a>, требующую соответствия всего адреса целиком. Секции стиля с такими regexp не были применены к странице. Вероятно, этот стиль был создан в \"Stylish для Chrome\", который некорректно проверяет regexp (известный баг).",
-		"description": ""
+		"message": "В стиле используются regexp-выражения, которые соответствуют лишь части адреса, что нарушает <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>спецификацию CSS4 @document</a>, требующую соответствия всего адреса целиком. Секции стиля с такими regexp не были применены к странице. Вероятно, этот стиль был создан в \"Stylish для Chrome\", который некорректно проверяет regexp (известный баг)."
 	},
 	"unreachableContentScript": {
-		"message": "Нет связи со страницей. Попробуйте перезагрузить вкладку.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
+		"message": "Нет связи со страницей. Попробуйте перезагрузить вкладку."
 	},
 	"sectionRemove": {
-		"message": "Удалить раздел",
-		"description": "Label for the button to remove a section"
+		"message": "Удалить раздел"
 	},
 	"disableAllStyles": {
-		"message": "Выключить все стили",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Выключить все стили"
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "Возможно был изменен локально.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+		"message": "Возможно был изменен локально."
 	},
 	"undoGlobal": {
-		"message": "Отменить (глобально)",
-		"description": "CSS-beautify global Undo button label"
+		"message": "Отменить (глобально)"
 	},
 	"updateCompleted": {
-		"message": "Обновление завершено.",
-		"description": "Text that displays when an update completed"
+		"message": "Обновление завершено."
 	},
 	"checkingForUpdate": {
-		"message": "Проверка…",
-		"description": "Text to display when checking a style for an update"
+		"message": "Проверка…"
 	},
 	"styleRegexpTestFull": {
-		"message": "Соответствующие вкладки",
-		"description": "RegExp test report: label for the fully matching expressions"
+		"message": "Соответствующие вкладки"
 	},
 	"manageMaxTargets": {
-		"message": "Кол-во целевых сайтов/выражений",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+		"message": "Кол-во целевых сайтов/выражений"
 	},
 	"manageFaviconsHelp": {
-		"message": "Используется сторонний сервис https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+		"message": "Используется сторонний сервис https://www.google.com/s2/favicons"
 	},
 	"updateCheckSkippedLocallyEdited": {
-		"message": "Стиль был изменен локально.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Стиль был изменен локально."
 	},
 	"optionsResetButton": {
-		"message": "Сброс настроек",
-		"description": ""
+		"message": "Сброс настроек"
 	},
 	"sectionCode": {
-		"message": "Код",
-		"description": "Label for the code for a section"
+		"message": "Код"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "Показывать команду \"Удалить\" в контекстном меню редактора",
-		"description": ""
+		"message": "Показывать команду \"Удалить\" в контекстном меню редактора"
 	},
 	"importReportLegendUpdatedBoth": {
-		"message": "обновлены мета-данные и код",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+		"message": "обновлены мета-данные и код"
 	},
 	"cm_smartIndent": {
-		"message": "Умные отступы",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Умные отступы"
 	},
 	"styleRegexpTestButton": {
-		"message": "Тест регулярки",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
+		"message": "Тест регулярки"
 	},
 	"appliesHelp": {
-		"message": "Чтобы указать, к каким URL относится код в этом разделе, воспользуйтесь параметром \"Применить к\".",
-		"description": "Help text for 'applies to' section"
+		"message": "Чтобы указать, к каким URL относится код в этом разделе, воспользуйтесь параметром \"Применить к\"."
 	},
 	"editStyleHeading": {
-		"message": "Изменение стиля",
-		"description": "Title of the page for editing styles"
+		"message": "Изменение стиля"
 	},
 	"editDeleteText": {
-		"message": "Удалить",
-		"description": "Label for the context menu item in the editor to delete selected text"
+		"message": "Удалить"
 	},
 	"cm_matchHighlightSelection": {
-		"message": "Выделенный текст",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Выделенный текст"
 	},
 	"updateAllCheckSucceededSomeEdited": {
-		"message": "Не все стили были проверены, чтобы не потерять возможные локальные изменения. Форсировать обновление стиля можно индивидуально или запустив перепроверку всех обновляемых стилей (локальные изменения будут утеряны).",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "Не все стили были проверены, чтобы не потерять возможные локальные изменения. Форсировать обновление стиля можно индивидуально или запустив перепроверку всех обновляемых стилей (локальные изменения будут утеряны)."
 	},
 	"stylusUnavailableForURL": {
-		"message": "Такие адреса не поддерживаются.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Такие адреса не поддерживаются."
 	},
 	"manageOnlyUpdates": {
-		"message": "Только обновляемые и проблемные",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
+		"message": "Только обновляемые и проблемные"
 	},
 	"addStyleTitle": {
-		"message": "Добавление стиля",
-		"description": "Title of the page for adding styles"
+		"message": "Добавление стиля"
 	},
 	"importReplaceLabel": {
-		"message": "Заменить стиль",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Заменить стиль"
 	},
 	"dbError": {
-		"message": "Возникла ошибка доступа к базе данных Stylus. Хотите перейти на страницу с возможными способами решения?",
-		"description": "Prompt when a DB error is encountered"
+		"message": "Возникла ошибка доступа к базе данных Stylus. Хотите перейти на страницу с возможными способами решения?"
 	},
 	"optionsAdvanced": {
-		"message": "Другое",
-		"description": ""
+		"message": "Другое"
 	},
 	"importAppendTooltip": {
-		"message": "Добавить импортируемый стиль к редактируемому",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
+		"message": "Добавить импортируемый стиль к редактируемому"
 	},
 	"editorStylesButton": {
-		"message": "Сменить тему Стилус",
-		"description": "Find styles for the editor"
+		"message": "Сменить тему Стилус"
 	},
 	"optionsOpen": {
-		"message": "Открыть",
-		"description": ""
+		"message": "Открыть"
 	},
 	"helpKeyMapHotkey": {
-		"message": "Нажмите клавишу",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Нажмите клавишу"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "Пропущены некомпилируемые регулярки",
-		"description": "RegExp test report: label for the invalid expressions"
+		"message": "Пропущены некомпилируемые регулярки"
 	},
 	"replaceAll": {
-		"message": "Заменить все",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Заменить все"
 	},
 	"importReportUnchanged": {
-		"message": "Ничего не изменилось.",
-		"description": "Message in the report shown after importing styles"
+		"message": "Ничего не изменилось."
 	},
 	"optionsActions": {
-		"message": "Другие действия",
-		"description": ""
+		"message": "Другие действия"
 	},
 	"editGotoLine": {
-		"message": "Перейти к строке (или строке:колонке)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Перейти к строке (или строке:колонке)"
 	},
 	"manageOnlyLocalTooltip": {
-		"message": "(т.е. стили, не установленные посредством сайта userstyles.org)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
+		"message": "(т.е. стили, не установленные посредством сайта userstyles.org)"
 	},
 	"checkAllUpdates": {
-		"message": "Найти обновления всех стилей",
-		"description": "Label for the button to check all styles for updates"
+		"message": "Найти обновления всех стилей"
 	},
 	"openOptionsManage": {
-		"message": "Настройки",
-		"description": "Go to Options UI"
+		"message": "Настройки"
 	},
 	"issuesHelp": {
-		"message": "Проблемы и предупреждения по версии <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> с данными включенными правилами:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "Проблемы и предупреждения по версии <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> с данными включенными правилами:"
 	},
 	"optionsCustomizeBadge": {
-		"message": "Бейдж на пиктограмме в тулбаре",
-		"description": ""
+		"message": "Бейдж на пиктограмме в тулбаре"
 	},
 	"importReportLegendIdentical": {
-		"message": "идентичные пропущены",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+		"message": "идентичные пропущены"
 	},
 	"optionsPopupWidth": {
-		"message": "Ширина всплывающего окна (в пикселах)",
-		"description": ""
+		"message": "Ширина всплывающего окна (в пикселах)"
 	},
 	"confirmNo": {
-		"message": "Нет",
-		"description": "'No' button in a confirm dialog"
+		"message": "Нет"
 	},
 	"undo": {
-		"message": "Отменить",
-		"description": "Button label"
+		"message": "Отменить"
 	},
 	"cm_keyMap": {
-		"message": "Раскладка",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Раскладка"
 	},
 	"manageNewUI": {
-		"message": "Новый интерфейс",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
+		"message": "Новый интерфейс"
 	},
 	"importReportUndoneTitle": {
-		"message": "Откат импорта завершен",
-		"description": "Title of the message box shown after undoing the import of styles"
+		"message": "Откат импорта завершен"
 	},
 	"genericDisabledLabel": {
-		"message": "Отключен",
-		"description": "Used in various lists/options to indicate that something is disabled"
+		"message": "Отключен"
 	},
 	"cm_indentWithTabs": {
-		"message": "Умные отступы при помощи табуляции",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+		"message": "Умные отступы при помощи табуляции"
 	},
 	"replaceWith": {
-		"message": "Заменить на",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Заменить на"
 	},
 	"deleteStyleLabel": {
-		"message": "Удалить",
-		"description": "Label for the button to delete a style"
+		"message": "Удалить"
 	},
 	"updateCheckManualUpdateForce": {
-		"message": "Установить обновление (локальные изменения будут утеряны)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+		"message": "Установить обновление (локальные изменения будут утеряны)"
 	},
 	"optionsAdvancedExposeIframes": {
-		"message": "Выявлять iframe путем добавления HTML[stylus-iframe]",
-		"description": ""
+		"message": "Выявлять iframe путем добавления HTML[stylus-iframe]"
 	},
 	"addStyleLabel": {
-		"message": "Создать стиль",
-		"description": "Label for the button to go to the add style page"
+		"message": "Создать стиль"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "Для отключения автоматического обновления стилей введите 0 (ноль)",
-		"description": ""
+		"message": "Для отключения автоматического обновления стилей введите 0 (ноль)"
 	},
 	"backupButtons": {
-		"message": "Резервное копирование",
-		"description": "Heading for backup"
+		"message": "Резервное копирование"
 	},
 	"manageOnlyEnabled": {
-		"message": "Только включенные стили",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Только включенные стили"
 	},
 	"editStyleLabel": {
-		"message": "Изменить",
-		"description": "Label for the button to go to the edit style page"
+		"message": "Изменить"
 	},
 	"cm_theme": {
-		"message": "Тема",
-		"description": "Label for the style editor's CSS theme."
+		"message": "Тема"
 	},
 	"backupMessage": {
-		"message": "Нажмите Импорт чтобы выбрать файл или просто перетащите его на эту страницу",
-		"description": "Message for backup"
+		"message": "Нажмите Импорт чтобы выбрать файл или просто перетащите его на эту страницу"
 	},
 	"importReportUndone": {
-		"message": "восстановленных стилей",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+		"message": "восстановленных стилей"
 	},
 	"helpKeyMapCommand": {
-		"message": "Введите имя команды",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Введите имя команды"
 	},
 	"description": {
-		"message": "Настраивайте стили веб-сайтов с помощью менеджера стилей Stylus. Он позволяет легко установить темы и изменить внешний вид сайтов Google, Facebook, YouTube, Orkut и множества других веб-страниц.",
-		"description": "Extension description"
+		"message": "Настраивайте стили веб-сайтов с помощью менеджера стилей Stylus. Он позволяет легко установить темы и изменить внешний вид сайтов Google, Facebook, YouTube, Orkut и множества других веб-страниц."
 	}
 }
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index fb77dfe3..4b7e89ba 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -1,111 +1,84 @@
 {
 	"appliesToEverything": {
-		"message": "Све",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "Све"
 	},
 	"defaultTheme": {
-		"message": "подразумевано",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "подразумевано"
 	},
 	"exportLabel": {
-		"message": "Извези",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+		"message": "Извези"
 	},
 	"issues": {
-		"message": "Проблеми",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Проблеми"
 	},
 	"cm_tabSize": {
-		"message": "Величина картице",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Величина картице"
 	},
 	"enableStyleLabel": {
-		"message": "Омогући",
-		"description": "Label for the button to enable a style"
+		"message": "Омогући"
 	},
 	"styleMissingName": {
-		"message": "Унесите назив",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Унесите назив"
 	},
 	"appliesDomainOption": {
-		"message": "УРЛ адресе на домену",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "УРЛ адресе на домену"
 	},
 	"checkForUpdate": {
-		"message": "Проверите ажурирање",
-		"description": "Label for the button to check a single style for an update"
+		"message": "Проверите ажурирање"
 	},
 	"importAppendLabel": {
-		"message": "Додај стилу",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Додај стилу"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Сви стилови су ажурирани.",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "Сви стилови су ажурирани."
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Налепи код у Mozilla формату",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Налепи код у Mozilla формату"
 	},
 	"helpAlt": {
-		"message": "Помоћ",
-		"description": "Alternate text for help buttons"
+		"message": "Помоћ"
 	},
 	"search": {
-		"message": "Претражи",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "Претражи"
 	},
 	"confirmYes": {
-		"message": "Да",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Да"
 	},
 	"findStylesForSite": {
-		"message": "Пронађи још стилова за овај сајт",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Пронађи још стилова за овај сајт"
 	},
 	"manageHeading": {
-		"message": "Инсталирани стилови",
-		"description": "Heading for the manage page"
+		"message": "Инсталирани стилови"
 	},
 	"styleBeautify": {
-		"message": " Улепшај",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Улепшај"
 	},
 	"styleEnabledLabel": {
-		"message": "Омогућено",
-		"description": "Label for the enabled state of styles"
+		"message": "Омогућено"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla формат кода се може користити у Stylish за Firefox и може се послати на userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Mozilla формат кода се може користити у Stylish за Firefox и може се послати на userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Додај нови одељак",
-		"description": "Label for the button to add a section"
+		"message": "Додај нови одељак"
 	},
 	"styleSaveLabel": {
-		"message": "Сачувај",
-		"description": "Label for save button for style editing"
+		"message": "Сачувај"
 	},
 	"confirmStop": {
-		"message": "Заустави",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Заустави"
 	},
 	"writeStyleForURL": {
-		"message": "ову УРЛ адресу",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "ову УРЛ адресу"
 	},
 	"appliesAdd": {
-		"message": "Додај",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Додај"
 	},
 	"appliesRegexpOption": {
-		"message": "УРЛ адресе које одговарају регуларном изразу",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "УРЛ адресе које одговарају регуларном изразу"
 	},
 	"styleInstall": {
 		"message": "Инсталирати '$stylename$' у Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -113,74 +86,52 @@
 		}
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Преузмите стилове са userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Помоћ</a>",
-		"description": "Help text on the manage page"
+		"message": "<a href='https://userstyles.org'>Преузмите стилове са userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Помоћ</a>"
 	},
 	"searchStyles": {
-		"message": "Претражи садржај",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "Претражи садржај"
 	},
 	"disableStyleLabel": {
-		"message": "Онемогући",
-		"description": "Label for the button to disable a style"
+		"message": "Онемогући"
 	},
 	"prefShowBadge": {
-		"message": "Прикажи број активних стилова за тренутни сајт на дугмету на алатној траци",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Прикажи број активних стилова за тренутни сајт на дугмету на алатној траци"
 	},
 	"menuShowBadge": {
-		"message": "Прикажи број активних стилова",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Прикажи број активних стилова"
 	},
 	"cm_lineWrapping": {
-		"message": "Преламање текста",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Преламање текста"
 	},
 	"styleCancelEditLabel": {
-		"message": "Назад на управљање",
-		"description": "Label for cancel button for style editing"
+		"message": "Назад на управљање"
 	},
 	"styleChangesNotSaved": {
-		"message": "Направили сте измене овог стила које нисте сачували.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+		"message": "Направили сте измене овог стила које нисте сачували."
 	},
 	"importLabel": {
-		"message": "Увези",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Увези"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Ажурирање није успело: сервер није доступан.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Ажурирање није успело: сервер није доступан."
 	},
 	"manageFilters": {
-		"message": "Филтери",
-		"description": "Label for filters container"
+		"message": "Филтери"
 	},
 	"applyAllUpdates": {
-		"message": "Примени сва ажурирања",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Примени сва ажурирања"
 	},
 	"deleteStyleConfirm": {
-		"message": "Да ли сте сигурни да желите да избришете овај стил?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "Да ли сте сигурни да желите да избришете овај стил?"
 	},
 	"styleBadRegexp": {
-		"message": "Регуларни израз је неисправан.",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "Регуларни израз је неисправан."
 	},
 	"optionsHeading": {
-		"message": "Опције",
-		"description": "Heading for options section on manage page."
+		"message": "Опције"
 	},
 	"appliesDisplay": {
 		"message": "Примењује се на: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,7 +140,6 @@
 	},
 	"styleUpdate": {
 		"message": "Да ли сте сигурни да желите да ажурирате '$stylename$'?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -197,12 +147,10 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Одељци",
-		"description": "Title for the style sections section"
+		"message": "Одељци"
 	},
 	"editStyleTitle": {
 		"message": "Уреди стил $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +158,49 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Стил је ажуриран.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Стил је ажуриран."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "УРЛ адресе које почињу са",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
+		"message": "УРЛ адресе које почињу са"
 	},
 	"searchRegexp": {
-		"message": "Користи /re/ синтаксу за претрагу  регуларним изразом",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
+		"message": "Користи /re/ синтаксу за претрагу  регуларним изразом"
 	},
 	"importReplaceTooltip": {
-		"message": "Одбаци садржај тренутног стила и упиши преко њега увезени стил",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Одбаци садржај тренутног стила и упиши преко њега увезени стил"
 	},
 	"popupStylesFirst": {
-		"message": "Излистај стилове пре команди у менију дугмета на алатној траци",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "Излистај стилове пре команди у менију дугмета на алатној траци"
 	},
 	"sectionHelp": {
-		"message": "Одељци вам омогућавају да дефинишете различите делове кода који се примењују на раличите скупове УРЛ-ова у истом стилу. На пример, један исти стил може променити почетну страницу једног сајта на један начин а остатак сајта на други начин.",
-		"description": "Help text for sections"
+		"message": "Одељци вам омогућавају да дефинишете различите делове кода који се примењују на раличите скупове УРЛ-ова у истом стилу. На пример, један исти стил може променити почетну страницу једног сајта на један начин а остатак сајта на други начин."
 	},
 	"noStylesForSite": {
-		"message": "Нема инсталираних стилова за овај сајт.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Нема инсталираних стилова за овај сајт."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "и још",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "и још"
 	},
 	"appliesRemove": {
-		"message": "Уклони",
-		"description": "Label for the button to remove an 'applies' entry"
+		"message": "Уклони"
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Стил у Mozilla формату",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Стил у Mozilla формату"
 	},
 	"writeStyleFor": {
-		"message": "Упиши стил за:",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+		"message": "Упиши стил за:"
 	},
 	"replace": {
-		"message": "Замени",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Замени"
 	},
 	"appliesLabel": {
-		"message": "Примењује се на",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Примењује се на"
 	},
 	"openManage": {
-		"message": "Управљај инсталираним стиловима",
-		"description": "Link to open the manage page."
+		"message": "Управљај инсталираним стиловима"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Ажурирање није успело: сервер је одговорио кодом $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,143 +208,108 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Детаљније",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Детаљније"
 	},
 	"installUpdate": {
-		"message": "Инсталирај ажурирање",
-		"description": "Label for the button to install an update for a single style"
+		"message": "Инсталирај ажурирање"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla формат",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Mozilla формат"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus не ради на страницама као што је ова.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus не ради на страницама као што је ова."
 	},
 	"sectionRemove": {
-		"message": "Уклони одељак",
-		"description": "Label for the button to remove a section"
+		"message": "Уклони одељак"
 	},
 	"disableAllStyles": {
-		"message": "Искључи све стилове",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Искључи све стилове"
 	},
 	"undoGlobal": {
-		"message": "Опозови (свеобухватно)",
-		"description": "CSS-beautify global Undo button label"
+		"message": "Опозови (свеобухватно)"
 	},
 	"updateCompleted": {
-		"message": "Ажурирање је комплетирано.",
-		"description": "Text that displays when an update completed"
+		"message": "Ажурирање је комплетирано."
 	},
 	"checkingForUpdate": {
-		"message": "Проверавање...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Проверавање..."
 	},
 	"sectionCode": {
-		"message": "Код",
-		"description": "Label for the code for a section"
+		"message": "Код"
 	},
 	"cm_smartIndent": {
-		"message": "Користи паметно увлачење редова",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Користи паметно увлачење редова"
 	},
 	"appliesHelp": {
-		"message": "Употреба 'Примењује се на' одређује опсег УРЛ адреса на које се код у овом одељку примењује.",
-		"description": "Help text for 'applies to' section"
+		"message": "Употреба 'Примењује се на' одређује опсег УРЛ адреса на које се код у овом одељку примењује."
 	},
 	"editStyleHeading": {
-		"message": "Уреди стил",
-		"description": "Title of the page for editing styles"
+		"message": "Уреди стил"
 	},
 	"appliesUrlOption": {
-		"message": "УРЛ",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "УРЛ"
 	},
 	"addStyleTitle": {
-		"message": "Додај стил",
-		"description": "Title of the page for adding styles"
+		"message": "Додај стил"
 	},
 	"importReplaceLabel": {
-		"message": "Упиши преко стила",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Упиши преко стила"
 	},
 	"dbError": {
-		"message": "Дошло је до грешке користећи Stylus базу података. Да ли желите да посетите веб страницу са могућим решењима?",
-		"description": "Prompt when a DB error is encountered"
+		"message": "Дошло је до грешке користећи Stylus базу података. Да ли желите да посетите веб страницу са могућим решењима?"
 	},
 	"importAppendTooltip": {
-		"message": "Додај увезени стил тренутном стилу",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
+		"message": "Додај увезени стил тренутном стилу"
 	},
 	"helpKeyMapHotkey": {
-		"message": "Притисни пречицу",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Притисни пречицу"
 	},
 	"replaceAll": {
-		"message": "Замени све",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Замени све"
 	},
 	"editGotoLine": {
-		"message": "Иди на ред (или line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Иди на ред (или line:col)"
 	},
 	"checkAllUpdates": {
-		"message": "Проверите ажурирања за све стилове",
-		"description": "Label for the button to check all styles for updates"
+		"message": "Проверите ажурирања за све стилове"
 	},
 	"issuesHelp": {
-		"message": "Проблем пронађен од стране <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> са овим омогућеним правилима:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "Проблем пронађен од стране <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> са овим омогућеним правилима:"
 	},
 	"confirmNo": {
-		"message": "Не",
-		"description": "'No' button in a confirm dialog"
+		"message": "Не"
 	},
 	"undo": {
-		"message": "Опозови",
-		"description": "Button label"
+		"message": "Опозови"
 	},
 	"cm_keyMap": {
-		"message": "Мапа тастера",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Мапа тастера"
 	},
 	"cm_indentWithTabs": {
-		"message": "Користи картице са паметним увлачењем редова",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+		"message": "Користи картице са паметним увлачењем редова"
 	},
 	"replaceWith": {
-		"message": "Замени са",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Замени са"
 	},
 	"deleteStyleLabel": {
-		"message": "Избриши",
-		"description": "Label for the button to delete a style"
+		"message": "Избриши"
 	},
 	"addStyleLabel": {
-		"message": "Упиши нови стил",
-		"description": "Label for the button to go to the add style page"
+		"message": "Упиши нови стил"
 	},
 	"manageOnlyEnabled": {
-		"message": "Само омогућени стилови",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Само омогућени стилови"
 	},
 	"editStyleLabel": {
-		"message": "Уреди",
-		"description": "Label for the button to go to the edit style page"
+		"message": "Уреди"
 	},
 	"cm_theme": {
-		"message": "Тема",
-		"description": "Label for the style editor's CSS theme."
+		"message": "Тема"
 	},
 	"helpKeyMapCommand": {
-		"message": "Укуцај име команде",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Укуцај име команде"
 	},
 	"description": {
-		"message": "Измените стил интернет мреже управљачем корисничких стилова. Stylus вам омогућава да лако инсталирате теме и скинове за многе популарне сајтове.",
-		"description": "Extension description"
+		"message": "Измените стил интернет мреже управљачем корисничких стилова. Stylus вам омогућава да лако инсталирате теме и скинове за многе популарне сајтове."
 	}
 }
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index 59644ffb..bb5ba747 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -1,186 +1,101 @@
 {
 	"appliesToEverything": {
-		"message": "Allt",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Allt"
 	},
 	"cm_tabSize": {
-		"message": "Flikstorlek",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Flikstorlek"
 	},
 	"enableStyleLabel": {
-		"message": "Aktivera",
-		"description": "Label for the button to enable a style"
+		"message": "Aktivera"
 	},
 	"styleMissingName": {
-		"message": "Ange ett namn.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Ange ett namn."
 	},
 	"appliesDomainOption": {
-		"message": "URL:er på domänen",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL:er på domänen"
 	},
 	"checkForUpdate": {
-		"message": "Leta efter uppdatering",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Leta efter uppdatering"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Alla stilar är fullt uppdaterade.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Alla stilar är fullt uppdaterade."
 	},
 	"helpAlt": {
-		"message": "Hjälp",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Hjälp"
 	},
 	"findStylesForSite": {
-		"message": "Hitta fler stilar för denna sida",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Hitta fler stilar för denna sida"
 	},
 	"manageHeading": {
-		"message": "Installerade Stilar",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Installerade Stilar"
 	},
 	"styleEnabledLabel": {
-		"message": "Aktiverad",
-		"description": "Label for the enabled state of styles"
+		"message": "Aktiverad"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla-formatet av koden fungerar i Stylish till Firefox samt vid uppladdandet till userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Mozilla-formatet av koden fungerar i Stylish till Firefox samt vid uppladdandet till userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Lägg till ytterligare en sektion",
-		"description": "Label for the button to add a section"
+		"message": "Lägg till ytterligare en sektion"
 	},
 	"styleSaveLabel": {
-		"message": "Spara",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Spara"
 	},
 	"writeStyleForURL": {
-		"message": "denna URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "denna URL"
 	},
 	"appliesAdd": {
-		"message": "Lägg till",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Lägg till"
 	},
 	"appliesRegexpOption": {
-		"message": "URL:er som matchar regexp:en",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URL:er som matchar regexp:en"
 	},
 	"styleInstall": {
 		"message": "Installera '$stylename$' in i Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "Inaktivera",
-		"description": "Label for the button to disable a style"
+		"message": "Inaktivera"
 	},
 	"prefShowBadge": {
-		"message": "Visa antalet aktiva stilar för den nuvarande sidan på verktygsfältsikonen",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Visa antalet aktiva stilar för den nuvarande sidan på verktygsfältsikonen"
 	},
 	"menuShowBadge": {
-		"message": "Visa antalet aktiva stilar",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Visa antalet aktiva stilar"
 	},
 	"cm_lineWrapping": {
-		"message": "Radbrytning",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Radbrytning"
 	},
 	"styleCancelEditLabel": {
-		"message": "Återgå till hantera",
-		"description": "Label for cancel button for style editing"
+		"message": "Återgå till hantera"
 	},
 	"styleChangesNotSaved": {
-		"message": "Du har gjort ändringar i denna stil utan att spara.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Du har gjort ändringar i denna stil utan att spara."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Uppdateringen misslyckades: server onåbar.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Uppdateringen misslyckades: server onåbar."
 	},
 	"manageFilters": {
-		"message": "Filter",
-		"description": "Label for filters container"
+		"message": "Filter"
 	},
 	"applyAllUpdates": {
-		"message": "Verkställ alla uppdateringar",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Verkställ alla uppdateringar"
 	},
 	"deleteStyleConfirm": {
-		"message": "Är du säker på att du vill ta bort denna stil?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "Är du säker på att du vill ta bort denna stil?"
 	},
 	"styleBadRegexp": {
-		"message": "Regexp:en är ogiltig",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "Regexp:en är ogiltig"
 	},
 	"optionsHeading": {
-		"message": "Alternativ",
-		"description": "Heading for options section on manage page."
+		"message": "Alternativ"
 	},
 	"appliesDisplay": {
 		"message": "Gäller för: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,7 +104,6 @@
 	},
 	"styleUpdate": {
 		"message": "Är du säker på att du vill uppdatera '$stylename$'?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -197,12 +111,10 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Sektioner",
-		"description": "Title for the style sections section"
+		"message": "Sektioner"
 	},
 	"editStyleTitle": {
 		"message": "Ändra i Stil $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +122,37 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Stilen är fullt uppdaterad.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Stilen är fullt uppdaterad."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL:er som börjar på",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "URL:er som börjar på"
 	},
 	"popupStylesFirst": {
-		"message": "Lista stilar före kommandon i verktygsfältets knappmeny",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "Lista stilar före kommandon i verktygsfältets knappmeny"
 	},
 	"sectionHelp": {
-		"message": "Sektioner låter dig definiera olika sorters kod som påverkar olika URL:er i samma stil. Till exempel, en stil kan ändra en viss hemsida på ett sätt, samtidigt som den ändrar andra delar på en helt annan sida.",
-		"description": "Help text for sections"
+		"message": "Sektioner låter dig definiera olika sorters kod som påverkar olika URL:er i samma stil. Till exempel, en stil kan ändra en viss hemsida på ett sätt, samtidigt som den ändrar andra delar på en helt annan sida."
 	},
 	"noStylesForSite": {
-		"message": "Inga stilar installerade för denna sida.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Inga stilar installerade för denna sida."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "och mer",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "och mer"
 	},
 	"appliesRemove": {
-		"message": "Ta bort",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Ta bort"
 	},
 	"writeStyleFor": {
-		"message": "Skriv stil för:",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Skriv stil för:"
 	},
 	"appliesLabel": {
-		"message": "Gäller för",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Gäller för"
 	},
 	"openManage": {
-		"message": "Hantera installerade stilar",
-		"description": "Link to open the manage page."
+		"message": "Hantera installerade stilar"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Uppdateringen misslyckades: servern svarade med kod $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,139 +160,69 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specificera",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Specificera"
 	},
 	"installUpdate": {
-		"message": "Installera uppdatering",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Installera uppdatering"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus fungerar inte på sidor som denna.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus fungerar inte på sidor som denna."
 	},
 	"sectionRemove": {
-		"message": "Ta bort sektion",
-		"description": "Label for the button to remove a section"
+		"message": "Ta bort sektion"
 	},
 	"disableAllStyles": {
-		"message": "Stäng av alla stilar",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Stäng av alla stilar"
 	},
 	"updateCompleted": {
-		"message": "Uppdatering slutförd.",
-		"description": "Text that displays when an update completed"
+		"message": "Uppdatering slutförd."
 	},
 	"checkingForUpdate": {
-		"message": "Letar...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Letar..."
 	},
 	"sectionCode": {
-		"message": "Kod",
-		"description": "Label for the code for a section"
+		"message": "Kod"
 	},
 	"cm_smartIndent": {
-		"message": "Använd smart indrag",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Använd smart indrag"
 	},
 	"appliesHelp": {
-		"message": "Använd 'Gäller för' alternativet för att begränsa vilka URL:er koden i denna sektion gäller för.",
-		"description": "Help text for 'applies to' section"
+		"message": "Använd 'Gäller för' alternativet för att begränsa vilka URL:er koden i denna sektion gäller för."
 	},
 	"editStyleHeading": {
-		"message": "Ändra i Stil",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Ändra i Stil"
 	},
 	"addStyleTitle": {
-		"message": "Lägg till stil",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Lägg till stil"
 	},
 	"dbError": {
-		"message": "Ett fel inträffades vid hanteringen av Stylus-databasen. Skulle du vilja besöka en sida med eventuella lösningar?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Ett fel inträffades vid hanteringen av Stylus-databasen. Skulle du vilja besöka en sida med eventuella lösningar?"
 	},
 	"editGotoLine": {
-		"message": "Gå till rad (eller rad:kol)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Gå till rad (eller rad:kol)"
 	},
 	"checkAllUpdates": {
-		"message": "Leta igenom alla stilar efter uppdateringar",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
+		"message": "Leta igenom alla stilar efter uppdateringar"
 	},
 	"cm_keyMap": {
-		"message": "Nyckelkarta",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Nyckelkarta"
 	},
 	"cm_indentWithTabs": {
-		"message": "Använd flikar med smart indrag",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Använd flikar med smart indrag"
 	},
 	"deleteStyleLabel": {
-		"message": "Ta bort",
-		"description": "Label for the button to delete a style"
+		"message": "Ta bort"
 	},
 	"addStyleLabel": {
-		"message": "Skriv ny stil",
-		"description": "Label for the button to go to the add style page"
+		"message": "Skriv ny stil"
 	},
 	"manageOnlyEnabled": {
-		"message": "Endast aktiverade stilar",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Endast aktiverade stilar"
 	},
 	"editStyleLabel": {
-		"message": "Ändra",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Ändra"
 	},
 	"description": {
-		"message": "Style:a om webben med Stylus, en användarstils-hanterare. Stylus låter dig enkelt installera teman och skal för många populära sidor.",
-		"description": "Extension description"
+		"message": "Style:a om webben med Stylus, en användarstils-hanterare. Stylus låter dig enkelt installera teman och skal för många populära sidor."
 	}
 }
diff --git a/_locales/sv_SE/messages.json b/_locales/sv_SE/messages.json
index d097eb36..294773b4 100644
--- a/_locales/sv_SE/messages.json
+++ b/_locales/sv_SE/messages.json
@@ -1,186 +1,101 @@
 {
 	"appliesToEverything": {
-		"message": "Allt",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "Allt"
 	},
 	"cm_tabSize": {
-		"message": "Flikstorlek",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Flikstorlek"
 	},
 	"enableStyleLabel": {
-		"message": "Aktivera",
-		"description": "Label for the button to enable a style"
+		"message": "Aktivera"
 	},
 	"styleMissingName": {
-		"message": "Ange ett namn.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Ange ett namn."
 	},
 	"appliesDomainOption": {
-		"message": "URL:er på domänen",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "URL:er på domänen"
 	},
 	"checkForUpdate": {
-		"message": "Leta efter uppdatering",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "Leta efter uppdatering"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Alla stilar är fullt uppdaterade.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Alla stilar är fullt uppdaterade."
 	},
 	"helpAlt": {
-		"message": "Hjälp",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Hjälp"
 	},
 	"findStylesForSite": {
-		"message": "Hitta fler stilar för denna sida",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Hitta fler stilar för denna sida"
 	},
 	"manageHeading": {
-		"message": "Installerade Stilar",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Installerade Stilar"
 	},
 	"styleEnabledLabel": {
-		"message": "Aktiverad",
-		"description": "Label for the enabled state of styles"
+		"message": "Aktiverad"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla-formatet av koden fungerar i Stylish till Firefox samt vid uppladdandet till userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Mozilla-formatet av koden fungerar i Stylish till Firefox samt vid uppladdandet till userstyles.org."
 	},
 	"sectionAdd": {
-		"message": "Lägg till ytterligare en sektion",
-		"description": "Label for the button to add a section"
+		"message": "Lägg till ytterligare en sektion"
 	},
 	"styleSaveLabel": {
-		"message": "Spara",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "Spara"
 	},
 	"writeStyleForURL": {
-		"message": "denna URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "denna URL"
 	},
 	"appliesAdd": {
-		"message": "Lägg till",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Lägg till"
 	},
 	"appliesRegexpOption": {
-		"message": "URL:er som matchar regexp:en",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "URL:er som matchar regexp:en"
 	},
 	"styleInstall": {
 		"message": "Installera '$stylename$' in i Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "Inaktivera",
-		"description": "Label for the button to disable a style"
+		"message": "Inaktivera"
 	},
 	"prefShowBadge": {
-		"message": "Visa antalet aktiva stilar för den nuvarande sidan på verktygsfältsikonen",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "Visa antalet aktiva stilar för den nuvarande sidan på verktygsfältsikonen"
 	},
 	"menuShowBadge": {
-		"message": "Visa antalet aktiva stilar",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "Visa antalet aktiva stilar"
 	},
 	"cm_lineWrapping": {
-		"message": "Radbrytning",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Radbrytning"
 	},
 	"styleCancelEditLabel": {
-		"message": "Återgå till hantera",
-		"description": "Label for cancel button for style editing"
+		"message": "Återgå till hantera"
 	},
 	"styleChangesNotSaved": {
-		"message": "Du har gjort ändringar i denna stil utan att spara.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Du har gjort ändringar i denna stil utan att spara."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Uppdateringen misslyckades: server onåbar.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "Uppdateringen misslyckades: server onåbar."
 	},
 	"manageFilters": {
-		"message": "Filter",
-		"description": "Label for filters container"
+		"message": "Filter"
 	},
 	"applyAllUpdates": {
-		"message": "Verkställ alla uppdateringar",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Verkställ alla uppdateringar"
 	},
 	"deleteStyleConfirm": {
-		"message": "Är du säker på att du vill ta bort denna stil?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "Är du säker på att du vill ta bort denna stil?"
 	},
 	"styleBadRegexp": {
-		"message": "Regexp:en är ogiltig.",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "Regexp:en är ogiltig."
 	},
 	"optionsHeading": {
-		"message": "Alternativ",
-		"description": "Heading for options section on manage page."
+		"message": "Alternativ"
 	},
 	"appliesDisplay": {
 		"message": "Gäller för: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,7 +104,6 @@
 	},
 	"styleUpdate": {
 		"message": "Är du säker på att du vill uppdatera '$stylename$'?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -197,12 +111,10 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Sektioner",
-		"description": "Title for the style sections section"
+		"message": "Sektioner"
 	},
 	"editStyleTitle": {
 		"message": "Ändra i Stil $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +122,37 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Stilen är fullt uppdaterad.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Stilen är fullt uppdaterad."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL:er som börjar på",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "URL:er som börjar på"
 	},
 	"popupStylesFirst": {
-		"message": "Lista stilar före kommandon i verktygsfältets knappmeny",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "Lista stilar före kommandon i verktygsfältets knappmeny"
 	},
 	"sectionHelp": {
-		"message": "Sektioner låter dig definiera olika sorters kod som påverkar olika URL:er i samma stil. Till exempel, en stil kan ändra en viss hemsida på ett sätt, samtidigt som den ändrar andra delar på en helt annan sida.",
-		"description": "Help text for sections"
+		"message": "Sektioner låter dig definiera olika sorters kod som påverkar olika URL:er i samma stil. Till exempel, en stil kan ändra en viss hemsida på ett sätt, samtidigt som den ändrar andra delar på en helt annan sida."
 	},
 	"noStylesForSite": {
-		"message": "Inga stilar installerade för denna sida.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Inga stilar installerade för denna sida."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "och mer",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "och mer"
 	},
 	"appliesRemove": {
-		"message": "Ta bort",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Ta bort"
 	},
 	"writeStyleFor": {
-		"message": "Skapa stil för:",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Skapa stil för:"
 	},
 	"appliesLabel": {
-		"message": "Gäller för",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Gäller för"
 	},
 	"openManage": {
-		"message": "Hantera installerade stilar",
-		"description": "Link to open the manage page."
+		"message": "Hantera installerade stilar"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Uppdateringen misslyckades: servern svarade med kod $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,139 +160,69 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specificera",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Specificera"
 	},
 	"installUpdate": {
-		"message": "Installera uppdatering",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Installera uppdatering"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus fungerar inte på sidor som dessa.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus fungerar inte på sidor som dessa."
 	},
 	"sectionRemove": {
-		"message": "Ta bort sektion",
-		"description": "Label for the button to remove a section"
+		"message": "Ta bort sektion"
 	},
 	"disableAllStyles": {
-		"message": "Stäng av alla stilar",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Stäng av alla stilar"
 	},
 	"updateCompleted": {
-		"message": "Uppdatering slutförd.",
-		"description": "Text that displays when an update completed"
+		"message": "Uppdatering slutförd."
 	},
 	"checkingForUpdate": {
-		"message": "Letar...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Letar..."
 	},
 	"sectionCode": {
-		"message": "Kod",
-		"description": "Label for the code for a section"
+		"message": "Kod"
 	},
 	"cm_smartIndent": {
-		"message": "Använd smart indrag",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Använd smart indrag"
 	},
 	"appliesHelp": {
-		"message": "Använd 'Gäller för' alternativet för att begränsa vilka URL:er koden i denna sektion gäller för.",
-		"description": "Help text for 'applies to' section"
+		"message": "Använd 'Gäller för' alternativet för att begränsa vilka URL:er koden i denna sektion gäller för."
 	},
 	"editStyleHeading": {
-		"message": "Ändra i Stil",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Ändra i Stil"
 	},
 	"addStyleTitle": {
-		"message": "Lägg till stil",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "Lägg till stil"
 	},
 	"dbError": {
-		"message": "Ett fel inträffades vid hanteringen av Stylus-databasen. Skulle du vilja besöka en sida med eventuella lösningar?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "Ett fel inträffades vid hanteringen av Stylus-databasen. Skulle du vilja besöka en sida med eventuella lösningar?"
 	},
 	"editGotoLine": {
-		"message": "Gå till rad (eller rad:kol)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Gå till rad (eller rad:kol)"
 	},
 	"checkAllUpdates": {
-		"message": "Leta igenom alla stilar efter uppdateringar",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
+		"message": "Leta igenom alla stilar efter uppdateringar"
 	},
 	"cm_keyMap": {
-		"message": "Nyckelkarta",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "Nyckelkarta"
 	},
 	"cm_indentWithTabs": {
-		"message": "Använd flikar med smart indrag",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Använd flikar med smart indrag"
 	},
 	"deleteStyleLabel": {
-		"message": "Ta bort",
-		"description": "Label for the button to delete a style"
+		"message": "Ta bort"
 	},
 	"addStyleLabel": {
-		"message": "Skriv ny stil",
-		"description": "Label for the button to go to the add style page"
+		"message": "Skriv ny stil"
 	},
 	"manageOnlyEnabled": {
-		"message": "Endast aktiverade stilar",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Endast aktiverade stilar"
 	},
 	"editStyleLabel": {
-		"message": "Ändra",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Ändra"
 	},
 	"description": {
-		"message": "Style:a om webben med Stylus, en användarstils-hanterare. Stylus låter dig enkelt installera teman och skal för många populära sidor.",
-		"description": "Extension description"
+		"message": "Style:a om webben med Stylus, en användarstils-hanterare. Stylus låter dig enkelt installera teman och skal för många populära sidor."
 	}
 }
diff --git a/_locales/te/messages.json b/_locales/te/messages.json
index 4d5db859..fc2c57e3 100644
--- a/_locales/te/messages.json
+++ b/_locales/te/messages.json
@@ -1,413 +1,55 @@
 {
 	"appliesToEverything": {
-		"message": "అన్నిటికీ",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "అన్నిటికీ"
 	},
 	"enableStyleLabel": {
-		"message": "చేతనించు",
-		"description": "Label for the button to enable a style"
-	},
-	"styleMissingName": {
-		"message": "Enter a name.",
-		"description": "Error displayed when user saves without providing a name"
-	},
-	"appliesDomainOption": {
-		"message": "URLs on the domain",
-		"description": "Option to make the style apply to the entered string as a domain"
-	},
-	"checkForUpdate": {
-		"message": "Check for update",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "చేతనించు"
 	},
 	"helpAlt": {
-		"message": "సహాయం",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
-	"findStylesForSite": {
-		"message": "Find more styles for this site",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "సహాయం"
 	},
 	"manageHeading": {
-		"message": "స్థాపిత శైలులు",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleEnabledLabel": {
-		"message": "Enabled",
-		"description": "Label for the enabled state of styles"
-	},
-	"styleToMozillaFormatHelp": {
-		"message": "The Mozilla format of the code can be used with Stylish for Firefox and can be submitted to userstyles.org.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
-	},
-	"sectionAdd": {
-		"message": "Add another section",
-		"description": "Label for the button to add a section"
+		"message": "స్థాపిత శైలులు"
 	},
 	"styleSaveLabel": {
-		"message": "భద్రపరచు",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "భద్రపరచు"
 	},
 	"appliesAdd": {
-		"message": "చేర్చు",
-		"description": "Label for the button to add an 'applies' entry"
-	},
-	"appliesRegexpOption": {
-		"message": "URLs matching the regexp",
-		"description": "Option to make the style apply to the entered string as a regular expression"
-	},
-	"styleInstall": {
-		"message": "Install '$stylename$' into Stylus?",
-		"description": "Confirmation when installing a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "చేర్చు"
 	},
 	"disableStyleLabel": {
-		"message": "అచేతనించు",
-		"description": "Label for the button to disable a style"
-	},
-	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
-	},
-	"styleCancelEditLabel": {
-		"message": "Back to manage",
-		"description": "Label for cancel button for style editing"
-	},
-	"styleChangesNotSaved": {
-		"message": "You've made changes to this style without saving.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"updateCheckFailServerUnreachable": {
-		"message": "Update failed: server unreachable.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "అచేతనించు"
 	},
 	"deleteStyleConfirm": {
-		"message": "మీరు నజంగానే ఈ శైలిని తొలగించాలనుకుంటున్నారా?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "మీరు నజంగానే ఈ శైలిని తొలగించాలనుకుంటున్నారా?"
 	},
 	"appliesDisplay": {
 		"message": "వేటికి వర్తిస్తుంది; $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
-		"message": "విభాగాలు",
-		"description": "Title for the style sections section"
-	},
-	"editStyleTitle": {
-		"message": "Edit Style $stylename$",
-		"description": "Title of the page for editing styles",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
-	"updateCheckSucceededNoUpdate": {
-		"message": "Style is up to date.",
-		"description": "Text that displays when an update check completed and no update is available"
-	},
-	"appliesUrlPrefixOption": {
-		"message": "URLs starting with",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
-	},
-	"sectionHelp": {
-		"message": "Sections let you define different pieces of code to apply to different sets of URLs in the same style. For example, a single style could change the homepage of a site one way, while changing the rest of a site another way.",
-		"description": "Help text for sections"
-	},
-	"noStylesForSite": {
-		"message": "No styles installed for this site.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "విభాగాలు"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "ఇంకా మరిన్ని",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "ఇంకా మరిన్ని"
 	},
 	"appliesRemove": {
-		"message": "తొలగించు",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+		"message": "తొలగించు"
 	},
 	"manageTitle": {
-		"message": "స్టైలిష్",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"appliesLabel": {
-		"message": "Applies to",
-		"description": "Label for 'applies to' fields on the edit/add screen"
-	},
-	"openManage": {
-		"message": "Manage installed styles",
-		"description": "Link to open the manage page."
-	},
-	"updateCheckFailBadResponseCode": {
-		"message": "Update failed: server responded with code $code$.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
-		"placeholders": {
-			"code": {
-				"content": "$1"
-			}
-		}
-	},
-	"appliesSpecify": {
-		"message": "Specify",
-		"description": "Label for the button to make a style apply only to specific sites"
-	},
-	"installUpdate": {
-		"message": "Install update",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"sectionRemove": {
-		"message": "Remove section",
-		"description": "Label for the button to remove a section"
-	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
-	},
-	"updateCompleted": {
-		"message": "Update completed.",
-		"description": "Text that displays when an update completed"
-	},
-	"checkingForUpdate": {
-		"message": "Checking...",
-		"description": "Text to display when checking a style for an update"
-	},
-	"sectionCode": {
-		"message": "Code",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
-	},
-	"appliesHelp": {
-		"message": "Use the 'Applies to' controls to limit what URLs the code in this section applies to.",
-		"description": "Help text for 'applies to' section"
-	},
-	"editStyleHeading": {
-		"message": "Edit Style",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"addStyleTitle": {
-		"message": "Add Style",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
-	},
-	"checkAllUpdates": {
-		"message": "Check all styles for updates",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "స్టైలిష్"
 	},
 	"deleteStyleLabel": {
-		"message": "తొలగించు",
-		"description": "Label for the button to delete a style"
+		"message": "తొలగించు"
 	},
 	"addStyleLabel": {
-		"message": "క్రొత్త స్టైల్ వ్రాయండి",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "క్రొత్త స్టైల్ వ్రాయండి"
 	},
 	"editStyleLabel": {
-		"message": "మార్చు",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"description": {
-		"message": "Restyle the web with Stylus, a user styles manager. Stylus lets you easily install themes and skins for many popular sites.",
-		"description": "Extension description"
+		"message": "మార్చు"
 	}
 }
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index 771a56ab..0646679c 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -1,208 +1,82 @@
 {
 	"appliesToEverything": {
-		"message": "Her şey",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Her şey"
 	},
 	"enableStyleLabel": {
-		"message": "Etkinleştir",
-		"description": "Label for the button to enable a style"
+		"message": "Etkinleştir"
 	},
 	"styleMissingName": {
-		"message": "Bir ad girin.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "Bir ad girin."
 	},
 	"appliesDomainOption": {
-		"message": "Alan adındaki URLler",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "Alan adındaki URLler"
 	},
 	"checkForUpdate": {
-		"message": "Güncellemeleri denetle",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "Güncellemeleri denetle"
 	},
 	"helpAlt": {
-		"message": "Yardım",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "Yardım"
 	},
 	"findStylesForSite": {
-		"message": "Bu site için başka stiller bul",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "Bu site için başka stiller bul"
 	},
 	"manageHeading": {
-		"message": "Yüklü Stiller",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "Yüklü Stiller"
 	},
 	"styleEnabledLabel": {
-		"message": "Etkin",
-		"description": "Label for the enabled state of styles"
+		"message": "Etkin"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Kodun Mozilla biçimi, Firefox için Stylish ile kullanılabilir ve userstyles.org sitesine gönderilebilir.",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Kodun Mozilla biçimi, Firefox için Stylish ile kullanılabilir ve userstyles.org sitesine gönderilebilir."
 	},
 	"sectionAdd": {
-		"message": "Başka bölüm ekle",
-		"description": "Label for the button to add a section"
+		"message": "Başka bölüm ekle"
 	},
 	"styleSaveLabel": {
-		"message": "Kaydet",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "Kaydet"
 	},
 	"appliesAdd": {
-		"message": "Ekleyin",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "Ekleyin"
 	},
 	"appliesRegexpOption": {
-		"message": "regexp ile eşleşen URL'ler",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "regexp ile eşleşen URL'ler"
 	},
 	"styleInstall": {
 		"message": "'$stylename$' Stylus'e yüklensin mi?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "Devre dışı bırak",
-		"description": "Label for the button to disable a style"
-	},
-	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "Devre dışı bırak"
 	},
 	"styleCancelEditLabel": {
-		"message": "Yönetim sayfasına dön",
-		"description": "Label for cancel button for style editing"
+		"message": "Yönetim sayfasına dön"
 	},
 	"styleChangesNotSaved": {
-		"message": "Bu stilde yaptığınız, kaydedilmemiş değişiklikler var.",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "Bu stilde yaptığınız, kaydedilmemiş değişiklikler var."
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Güncellenemedi: sunucuya erişilemiyor.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "Güncellenemedi: sunucuya erişilemiyor."
 	},
 	"deleteStyleConfirm": {
-		"message": "Bu stili silmek istediğinizden emin misiniz?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "Bu stili silmek istediğinizden emin misiniz?"
 	},
 	"appliesDisplay": {
 		"message": "Şuraya uygulanır: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
-		"message": "Bölümler",
-		"description": "Title for the style sections section"
+		"message": "Bölümler"
 	},
 	"editStyleTitle": {
 		"message": "$stylename$ Stilini Düzenleyin",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +84,31 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Stil güncel.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "Stil güncel."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "Şununla başlayan URL'ler:",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "Şununla başlayan URL'ler:"
 	},
 	"sectionHelp": {
-		"message": "Bölümler, aynı stil içindeki farklı URL kümelerine uygulanacak farklı kod parçaları tanımlamanıza olanak sağlar. Örneğin, tek bir stil bir sitenin ana sayfasını belirli bir şekilde değiştirirken, sayfanın kalan kısmını farklı bir şekilde değiştirebilir.",
-		"description": "Help text for sections"
+		"message": "Bölümler, aynı stil içindeki farklı URL kümelerine uygulanacak farklı kod parçaları tanımlamanıza olanak sağlar. Örneğin, tek bir stil bir sitenin ana sayfasını belirli bir şekilde değiştirirken, sayfanın kalan kısmını farklı bir şekilde değiştirebilir."
 	},
 	"noStylesForSite": {
-		"message": "Bu site için hiçbir stil yüklenmedi.",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "Bu site için hiçbir stil yüklenmedi."
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "ve diğerleri",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "ve diğerleri"
 	},
 	"appliesRemove": {
-		"message": "Kaldır",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "Kaldır"
 	},
 	"appliesLabel": {
-		"message": "Şuraya uygulanır",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "Şuraya uygulanır"
 	},
 	"openManage": {
-		"message": "Yüklü stilleri yönet",
-		"description": "Link to open the manage page."
+		"message": "Yüklü stilleri yönet"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Güncellenemedi: sunucu yanıt olarak $code$ kodunu gönderdi.",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,135 +116,45 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Belirt",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "Belirt"
 	},
 	"installUpdate": {
-		"message": "Güncellemeyi yükle",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Güncellemeyi yükle"
 	},
 	"sectionRemove": {
-		"message": "Bölümü kaldır",
-		"description": "Label for the button to remove a section"
-	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "Bölümü kaldır"
 	},
 	"updateCompleted": {
-		"message": "Güncelleme tamamlandı.",
-		"description": "Text that displays when an update completed"
+		"message": "Güncelleme tamamlandı."
 	},
 	"checkingForUpdate": {
-		"message": "Kontrol ediliyor...",
-		"description": "Text to display when checking a style for an update"
+		"message": "Kontrol ediliyor..."
 	},
 	"sectionCode": {
-		"message": "Kod",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "Kod"
 	},
 	"appliesHelp": {
-		"message": "Bu bölümdeki kodun hangi URLlere uygulanacağını sınırlamak için 'Şuraya uygulanır' denetimlerini kullanın.",
-		"description": "Help text for 'applies to' section"
+		"message": "Bu bölümdeki kodun hangi URLlere uygulanacağını sınırlamak için 'Şuraya uygulanır' denetimlerini kullanın."
 	},
 	"editStyleHeading": {
-		"message": "Stili Düzenle",
-		"description": "Title of the page for editing styles"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "Stili Düzenle"
 	},
 	"addStyleTitle": {
-		"message": "Stil Ekleyin",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "Stil Ekleyin"
 	},
 	"checkAllUpdates": {
-		"message": "Tüm stiller için güncellemeleri denetle",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "Tüm stiller için güncellemeleri denetle"
 	},
 	"deleteStyleLabel": {
-		"message": "Sil",
-		"description": "Label for the button to delete a style"
+		"message": "Sil"
 	},
 	"addStyleLabel": {
-		"message": "Yeni stil oluşturun",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "Yeni stil oluşturun"
 	},
 	"editStyleLabel": {
-		"message": "Düzenle",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "Düzenle"
 	},
 	"description": {
-		"message": "Kullanıcı stil yöneticisi Stylus ile Web'in stilini yenileyin. Stylus Google, Facebook, YouTube, Orkut ve diğer pek çok site için temalar ve görünüm yüklemenize imkân tanır.",
-		"description": "Extension description"
+		"message": "Kullanıcı stil yöneticisi Stylus ile Web'in stilini yenileyin. Stylus Google, Facebook, YouTube, Orkut ve diğer pek çok site için temalar ve görünüm yüklemenize imkân tanır."
 	}
 }
diff --git a/_locales/zh/messages.json b/_locales/zh/messages.json
index a99b150c..77c1fb1e 100644
--- a/_locales/zh/messages.json
+++ b/_locales/zh/messages.json
@@ -1,186 +1,71 @@
 {
 	"appliesToEverything": {
-		"message": "所有站点",
-		"description": "Text displayed for styles that apply to all sites"
-	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "所有站点"
 	},
 	"enableStyleLabel": {
-		"message": "启用",
-		"description": "Label for the button to enable a style"
+		"message": "启用"
 	},
 	"styleMissingName": {
-		"message": "请输入名称.",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "请输入名称."
 	},
 	"appliesDomainOption": {
-		"message": "指定域上的URL",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "指定域上的URL"
 	},
 	"checkForUpdate": {
-		"message": "检查更新",
-		"description": "Label for the button to check a single style for an update"
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "检查更新"
 	},
 	"helpAlt": {
-		"message": "帮助",
-		"description": "Alternate text for help buttons"
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "帮助"
 	},
 	"findStylesForSite": {
-		"message": "查找更多适合此站点的样式",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "查找更多适合此站点的样式"
 	},
 	"manageHeading": {
-		"message": "已安装的样式",
-		"description": "Heading for the manage page"
-	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "已安装的样式"
 	},
 	"styleEnabledLabel": {
-		"message": "已启用",
-		"description": "Label for the enabled state of styles"
+		"message": "已启用"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "用于Firefox上的Stylish的Mozilla格式样式代码可以在 userstyles.org 上提交",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "用于Firefox上的Stylish的Mozilla格式样式代码可以在 userstyles.org 上提交"
 	},
 	"sectionAdd": {
-		"message": "添加新节",
-		"description": "Label for the button to add a section"
+		"message": "添加新节"
 	},
 	"styleSaveLabel": {
-		"message": "保存",
-		"description": "Label for save button for style editing"
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "保存"
 	},
 	"appliesAdd": {
-		"message": "添加",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "添加"
 	},
 	"appliesRegexpOption": {
-		"message": "匹配正则的URL",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "匹配正则的URL"
 	},
 	"styleInstall": {
 		"message": "安装 '$stylename$' 到 Stylus?",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
 	"disableStyleLabel": {
-		"message": "禁用",
-		"description": "Label for the button to disable a style"
-	},
-	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "禁用"
 	},
 	"styleCancelEditLabel": {
-		"message": "返回到管理",
-		"description": "Label for cancel button for style editing"
+		"message": "返回到管理"
 	},
 	"styleChangesNotSaved": {
-		"message": "您已经修改了此样式，但尚未保存",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
-	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "您已经修改了此样式，但尚未保存"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失败: 服务器无法访问.",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
-	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
+		"message": "更新失败: 服务器无法访问."
 	},
 	"deleteStyleConfirm": {
-		"message": "确定要删除这个样式吗?",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
+		"message": "确定要删除这个样式吗?"
 	},
 	"appliesDisplay": {
 		"message": "应用到: $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,7 +74,6 @@
 	},
 	"styleUpdate": {
 		"message": "你確定要更新 '$stylename$' 嗎？",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -197,12 +81,10 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "样式节",
-		"description": "Title for the style sections section"
+		"message": "样式节"
 	},
 	"editStyleTitle": {
 		"message": "编辑样式 $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +92,31 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "已经是最新的.",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "已经是最新的."
 	},
 	"appliesUrlPrefixOption": {
-		"message": "以指定地址开始",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "以指定地址开始"
 	},
 	"sectionHelp": {
-		"message": "样式节允许你定义多个样式段落并将它们应用于不同的站点匹配规则上。例如，一个样式可以更改使用一个方式来更改主页，而此时其它的样式段可以更改站点的其它部分。",
-		"description": "Help text for sections"
+		"message": "样式节允许你定义多个样式段落并将它们应用于不同的站点匹配规则上。例如，一个样式可以更改使用一个方式来更改主页，而此时其它的样式段可以更改站点的其它部分。"
 	},
 	"noStylesForSite": {
-		"message": "当前站点上没有已安装的样式",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "当前站点上没有已安装的样式"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "以及更多",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "以及更多"
 	},
 	"appliesRemove": {
-		"message": "移除",
-		"description": "Label for the button to remove an 'applies' entry"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "移除"
 	},
 	"appliesLabel": {
-		"message": "应用到",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "应用到"
 	},
 	"openManage": {
-		"message": "管理已安装样式",
-		"description": "Link to open the manage page."
+		"message": "管理已安装样式"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "更新失败: 服务器了返回代码 $code$。",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,135 +124,48 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "指定站点",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "指定站点"
 	},
 	"installUpdate": {
-		"message": "安装更新",
-		"description": "Label for the button to install an update for a single style"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "安装更新"
 	},
 	"sectionRemove": {
-		"message": "移除节",
-		"description": "Label for the button to remove a section"
-	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "移除节"
 	},
 	"updateCompleted": {
-		"message": "更新完成.",
-		"description": "Text that displays when an update completed"
+		"message": "更新完成."
 	},
 	"checkingForUpdate": {
-		"message": "检查中...",
-		"description": "Text to display when checking a style for an update"
+		"message": "检查中..."
 	},
 	"sectionCode": {
-		"message": "代码",
-		"description": "Label for the code for a section"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "代码"
 	},
 	"appliesHelp": {
-		"message": "使用“应用到”来控制这个样式应用到哪些地址上。",
-		"description": "Help text for 'applies to' section"
+		"message": "使用“应用到”来控制这个样式应用到哪些地址上。"
 	},
 	"editStyleHeading": {
-		"message": "编辑样式",
-		"description": "Title of the page for editing styles"
+		"message": "编辑样式"
 	},
 	"appliesUrlOption": {
-		"message": "地址",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "地址"
 	},
 	"addStyleTitle": {
-		"message": "添加样式",
-		"description": "Title of the page for adding styles"
-	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "添加样式"
 	},
 	"checkAllUpdates": {
-		"message": "检查所有样式的更新",
-		"description": "Label for the button to check all styles for updates"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "检查所有样式的更新"
 	},
 	"deleteStyleLabel": {
-		"message": "删除",
-		"description": "Label for the button to delete a style"
+		"message": "删除"
 	},
 	"addStyleLabel": {
-		"message": "编写新的样式",
-		"description": "Label for the button to go to the add style page"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
+		"message": "编写新的样式"
 	},
 	"editStyleLabel": {
-		"message": "编辑",
-		"description": "Label for the button to go to the edit style page"
-	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "编辑"
 	},
 	"description": {
-		"message": "Stylus，一个用户样式管理器，帮助您重新定义网页样式。Stylus易于为Google，Facebook，Youtube，Orkut以及其它各类型网站安装样式和主题。",
-		"description": "Extension description"
+		"message": "Stylus，一个用户样式管理器，帮助您重新定义网页样式。Stylus易于为Google，Facebook，Youtube，Orkut以及其它各类型网站安装样式和主题。"
 	}
 }
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index 9487826b..c5b7e3e1 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -1,199 +1,150 @@
 {
 	"appliesToEverything": {
-		"message": "全部",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "全部"
 	},
 	"defaultTheme": {
-		"message": "默认",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "默认"
 	},
 	"styleRegexpTestTitle": {
-		"message": "列出当前正则表达式匹配的网页标签（点击网址 URL 可跳转到该页）",
-		"description": "RegExp test report: title of the report"
+		"message": "列出当前正则表达式匹配的网页标签（点击网址 URL 可跳转到该页）"
 	},
 	"bckpInstStyles": {
-		"message": "导出所有样式",
-		"description": ""
+		"message": "导出所有样式"
 	},
 	"optionsUpdateInterval": {
-		"message": "每 N 小时，检查所有样式更新（0 为关闭检查）",
-		"description": ""
+		"message": "每 N 小时，检查所有样式更新（0 为关闭检查）"
 	},
 	"exportLabel": {
-		"message": "导出",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+		"message": "导出"
 	},
 	"issues": {
-		"message": "问题",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "问题"
 	},
 	"optionsBadgeNormal": {
-		"message": "背景颜色",
-		"description": ""
+		"message": "背景颜色"
 	},
 	"updateCheckHistory": {
-		"message": "检测升级的历史记录",
-		"description": ""
+		"message": "检测升级的历史记录"
 	},
 	"cm_tabSize": {
-		"message": "标签尺寸",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "标签尺寸"
 	},
 	"enableStyleLabel": {
-		"message": "启用",
-		"description": "Label for the button to enable a style"
+		"message": "启用"
 	},
 	"styleMissingName": {
-		"message": "输入名称。",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "输入名称。"
 	},
 	"genericHistoryLabel": {
-		"message": "历史",
-		"description": "Used in various places to show a history log of something"
+		"message": "历史"
 	},
 	"shortcutsNote": {
-		"message": "定义键盘快捷键",
-		"description": ""
+		"message": "定义键盘快捷键"
 	},
 	"appliesDomainOption": {
-		"message": "该域上的网址",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "该域上的网址"
 	},
 	"checkForUpdate": {
-		"message": "检查更新",
-		"description": "Label for the button to check a single style for an update"
+		"message": "检查更新"
 	},
 	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "正则表达式错误，样式无法正常运行",
-		"description": "Tooltip in the popup for styles that were not applied at all"
+		"message": "正则表达式错误，样式无法正常运行"
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "部分正则表达式无法生效。",
-		"description": ""
+		"message": "部分正则表达式无法生效。"
 	},
 	"importAppendLabel": {
-		"message": "追加到样式",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "追加到样式"
 	},
 	"optionsOpenManager": {
-		"message": "管理样式",
-		"description": ""
+		"message": "管理样式"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "没找到任何升级。",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "没找到任何升级。"
 	},
 	"importReportLegendAdded": {
-		"message": "个样式已添加",
-		"description": "Text after the number of styles added in the report shown after importing styles"
+		"message": "个样式已添加"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "粘贴 Mozilla 格式代码",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "粘贴 Mozilla 格式代码"
 	},
 	"dragDropMessage": {
-		"message": "把 json 备份文件拖放到页面的任意位置，即可导入数据库",
-		"description": "Drag'n'drop message"
+		"message": "把 json 备份文件拖放到页面的任意位置，即可导入数据库"
 	},
 	"helpAlt": {
-		"message": "帮助",
-		"description": "Alternate text for help buttons"
+		"message": "帮助"
 	},
 	"confirmOK": {
-		"message": "确认",
-		"description": ""
+		"message": "确认"
 	},
 	"search": {
-		"message": "搜索",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "搜索"
 	},
 	"manageFaviconsGray": {
-		"message": "灰色图标",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+		"message": "灰色图标"
 	},
 	"confirmYes": {
-		"message": "是",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "是"
 	},
 	"findStylesForSite": {
-		"message": "查找适合此网站的更多样式",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "查找适合此网站的更多样式"
 	},
 	"manageHeading": {
-		"message": "已安装的样式",
-		"description": "Heading for the manage page"
+		"message": "已安装的样式"
 	},
 	"styleBeautify": {
-		"message": "美化",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "美化"
 	},
 	"styleRegexpProblemTooltip": {
-		"message": "多个部分代码无法正常处理正则表达式",
-		"description": "Tooltip in the popup for styles that were applied only partially"
+		"message": "多个部分代码无法正常处理正则表达式"
 	},
 	"styleEnabledLabel": {
-		"message": "已启用",
-		"description": "Label for the enabled state of styles"
+		"message": "已启用"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "FireFox(Mozilla) 格式的 CSS 代码导入后，会自动转换成适 Stylus 使用的 Chrome 格式的 CSS 代码。反过来，Chrome 格式的 CSS 也可以导出为适合 FireFox 使用的格式。需要注意的是，如果你要提交你的 CSS 代码到 userstyles.org，则必须使用 FireFox(Mozilla) 格式的 CSS 代码。",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "FireFox(Mozilla) 格式的 CSS 代码导入后，会自动转换成适 Stylus 使用的 Chrome 格式的 CSS 代码。反过来，Chrome 格式的 CSS 也可以导出为适合 FireFox 使用的格式。需要注意的是，如果你要提交你的 CSS 代码到 userstyles.org，则必须使用 FireFox(Mozilla) 格式的 CSS 代码。"
 	},
 	"sectionAdd": {
-		"message": "添加其他部分",
-		"description": "Label for the button to add a section"
+		"message": "添加其他部分"
 	},
 	"styleRegexpTestPartial": {
-		"message": "没有完全匹配，因此忽略",
-		"description": "RegExp test report: label for the partially matching expressions"
+		"message": "没有完全匹配，因此忽略"
 	},
 	"styleSaveLabel": {
-		"message": "保存",
-		"description": "Label for save button for style editing"
+		"message": "保存"
 	},
 	"confirmDelete": {
-		"message": "删除",
-		"description": ""
+		"message": "删除"
 	},
 	"confirmCancel": {
-		"message": "取消",
-		"description": ""
+		"message": "取消"
 	},
 	"retrieveBckp": {
-		"message": "导入所有样式",
-		"description": ""
+		"message": "导入所有样式"
 	},
 	"confirmStop": {
-		"message": "停止",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "停止"
 	},
 	"writeStyleForURL": {
-		"message": "这个URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "这个URL"
 	},
 	"optionsSubheading": {
-		"message": "附加选项",
-		"description": "Subheading for options section on manage page."
+		"message": "附加选项"
 	},
 	"appliesAdd": {
-		"message": "添加",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "添加"
 	},
 	"appliesRegexpOption": {
-		"message": "与该正则表达式匹配的网址",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "与该正则表达式匹配的网址"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "在开发者工具中，找到 Stylus 特定插入的框架代码，以便调用，例如：“html[stylus-iframe] h1 { display:none }”",
-		"description": ""
+		"message": "在开发者工具中，找到 Stylus 特定插入的框架代码，以便调用，例如：“html[stylus-iframe] h1 { display:none }”"
 	},
 	"importReportLegendUpdatedCode": {
-		"message": "代码已更新",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
+		"message": "代码已更新"
 	},
 	"styleInstall": {
 		"message": "要将“$stylename$”安装到 Stylus 中吗？",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -201,112 +152,85 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "关闭时的背景颜色",
-		"description": ""
+		"message": "关闭时的背景颜色"
 	},
 	"optionsCheck": {
-		"message": "升级样式",
-		"description": ""
+		"message": "升级样式"
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>从 userstyles.org 获取样式</a> | <a href='http://add0n.com/stylus.html'>帮助</a>",
-		"description": "Help text on the manage page"
+		"message": "<a href='https://userstyles.org'>从 userstyles.org 获取样式</a> | <a href='http://add0n.com/stylus.html'>帮助</a>"
 	},
 	"manageOnlyLocal": {
-		"message": "只显示在本地创建的样式",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+		"message": "只显示在本地创建的样式"
 	},
 	"searchStyles": {
-		"message": "搜索内容",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "搜索内容"
 	},
 	"optionsUpdateImportNote": {
-		"message": "从旧版本的 Stylus 或 Stylish 中导入样式备份时，请在样式管理器中手动检测升级一次，以确保所有样式都可更新到最新版本。",
-		"description": ""
+		"message": "从旧版本的 Stylus 或 Stylish 中导入样式备份时，请在样式管理器中手动检测升级一次，以确保所有样式都可更新到最新版本。"
 	},
 	"checkAllUpdatesForce": {
-		"message": "再检测一次，我没有修改过任何样式。",
-		"description": "Label for the button to apply all detected updates"
+		"message": "再检测一次，我没有修改过任何样式。"
 	},
 	"unreachableFileHint": {
-		"message": "如果需要改变 file:// 协议的样式，则需要在 chrome://extensions 页面中的 Stylus 扩展选项里面，打开 允许访问文件网址 的权限",
-		"description": "Note in the toolbar popup for file:// URLs"
+		"message": "如果需要改变 file:// 协议的样式，则需要在 chrome://extensions 页面中的 Stylus 扩展选项里面，打开 允许访问文件网址 的权限"
 	},
 	"disableStyleLabel": {
-		"message": "停用",
-		"description": "Label for the button to disable a style"
+		"message": "停用"
 	},
 	"prefShowBadge": {
-		"message": "当前网站激活的样式数量",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "当前网站激活的样式数量"
 	},
 	"manageFavicons": {
-		"message": "显示应用对象的图标",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+		"message": "显示应用对象的图标"
 	},
 	"menuShowBadge": {
-		"message": "显示生效的样式计数",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "显示生效的样式计数"
 	},
 	"cm_lineWrapping": {
-		"message": "自动换行",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "自动换行"
 	},
 	"styleCancelEditLabel": {
-		"message": "返回进行管理操作",
-		"description": "Label for cancel button for style editing"
+		"message": "返回进行管理操作"
 	},
 	"styleChangesNotSaved": {
-		"message": "您已对此样式进行了更改，但尚未保存。",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+		"message": "您已对此样式进行了更改，但尚未保存。"
 	},
 	"importLabel": {
-		"message": "导入",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "导入"
 	},
 	"shortcuts": {
-		"message": "快捷键",
-		"description": "Go to shortcut configuration"
+		"message": "快捷键"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失败: 无法访问服务器。",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "更新失败: 无法访问服务器。"
 	},
 	"manageFilters": {
-		"message": "过滤器",
-		"description": "Label for filters container"
+		"message": "过滤器"
 	},
 	"applyAllUpdates": {
-		"message": "应用全部更新",
-		"description": "Label for the button to apply all detected updates"
+		"message": "应用全部更新"
 	},
 	"optionsReset": {
-		"message": "重置所有选项为默认值",
-		"description": ""
+		"message": "重置所有选项为默认值"
 	},
 	"optionsCustomizeUpdate": {
-		"message": "检测升级",
-		"description": ""
+		"message": "检测升级"
 	},
 	"deleteStyleConfirm": {
-		"message": "确定要删除此样式吗？",
-		"description": "Confirmation before deleting a style"
+		"message": "确定要删除此样式吗？"
 	},
 	"optionsCustomizePopup": {
-		"message": "样式管理弹框",
-		"description": ""
+		"message": "样式管理弹框"
 	},
 	"styleBadRegexp": {
-		"message": "正则表达式无效。",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "正则表达式无效。"
 	},
 	"optionsHeading": {
-		"message": "选项",
-		"description": "Heading for options section on manage page."
+		"message": "选项"
 	},
 	"appliesDisplay": {
 		"message": "应用对象：$applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -314,12 +238,10 @@
 		}
 	},
 	"openStylesManager": {
-		"message": "打开样式管理器",
-		"description": "Label for the style maanger opener in the browser action context menu."
+		"message": "打开样式管理器"
 	},
 	"styleUpdate": {
 		"message": "您确定要更新 '$stylename$'?",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -327,16 +249,13 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "部分",
-		"description": "Title for the style sections section"
+		"message": "部分"
 	},
 	"importReportLegendInvalid": {
-		"message": "忽略无效的代码",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
+		"message": "忽略无效的代码"
 	},
 	"editStyleTitle": {
 		"message": "修改样式“$stylename$”",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -344,96 +263,70 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "样式已是最新版本。",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "样式已是最新版本。"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "网址前缀",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
+		"message": "网址前缀"
 	},
 	"cm_matchHighlightToken": {
-		"message": "光标所在的位置",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+		"message": "光标所在的位置"
 	},
 	"searchRegexp": {
-		"message": "使用 /re/ 语法进行正则表达式搜索",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
+		"message": "使用 /re/ 语法进行正则表达式搜索"
 	},
 	"updateCheckManualUpdateHint": {
-		"message": "强制升级将覆盖所有本地修改的样式",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+		"message": "强制升级将覆盖所有本地修改的样式"
 	},
 	"toggleStyle": {
-		"message": "切换样式",
-		"description": "Label for the checkbox to enable/disable a style"
+		"message": "切换样式"
 	},
 	"importReplaceTooltip": {
-		"message": "放弃当前样式的内容，使用已导入样式覆盖它",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "放弃当前样式的内容，使用已导入样式覆盖它"
 	},
 	"popupStylesFirst": {
-		"message": "样式列表置顶",
-		"description": "Label for the checkbox controlling section order in the popup."
+		"message": "样式列表置顶"
 	},
 	"sectionHelp": {
-		"message": "各部分可让您定义不同的代码段，以通过同一样式应用到不同的网址组。例如，某个单一样式能以一种方式更改网站首页，同时以另一种方式更改网站的其余部分。",
-		"description": "Help text for sections"
+		"message": "各部分可让您定义不同的代码段，以通过同一样式应用到不同的网址组。例如，某个单一样式能以一种方式更改网站首页，同时以另一种方式更改网站的其余部分。"
 	},
 	"noStylesForSite": {
-		"message": "未对此网站安装任何样式。",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "未对此网站安装任何样式。"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "等等",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "等等"
 	},
 	"appliesRemove": {
-		"message": "删除",
-		"description": "Label for the button to remove an 'applies' entry"
+		"message": "删除"
 	},
 	"updatesCurrentlyInstalled": {
-		"message": "更新已安装",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+		"message": "更新已安装"
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Mozilla 格式的样式",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Mozilla 格式的样式"
 	},
 	"writeStyleFor": {
-		"message": "编写样式给：",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+		"message": "编写样式给："
 	},
 	"replace": {
-		"message": "替换",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "替换"
 	},
 	"styleRegexpTestNone": {
-		"message": "没有发现任何网页标签与正则表达式匹配",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
+		"message": "没有发现任何网页标签与正则表达式匹配"
 	},
 	"importReportLegendUpdatedMeta": {
-		"message": "升级信息",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
+		"message": "升级信息"
 	},
 	"appliesLabel": {
-		"message": "应用对象：",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "应用对象："
 	},
 	"openOptionsPopup": {
-		"message": "设置用户界面",
-		"description": "Go to Options UI"
+		"message": "设置用户界面"
 	},
 	"openManage": {
-		"message": "管理已安装的样式",
-		"description": "Link to open the manage page."
+		"message": "管理已安装的样式"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "更新失败: 服务器响应代码为 $code$。",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -441,295 +334,222 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "指定",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "指定"
 	},
 	"installUpdate": {
-		"message": "安装更新",
-		"description": "Label for the button to install an update for a single style"
+		"message": "安装更新"
 	},
 	"optionsCheckUpdate": {
-		"message": "检查所有样式更新",
-		"description": ""
+		"message": "检查所有样式更新"
 	},
 	"importReportTitle": {
-		"message": "样式导入完成",
-		"description": "Title of the report shown after importing styles"
+		"message": "样式导入完成"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla 格式",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Mozilla 格式"
 	},
 	"cm_matchHighlight": {
-		"message": "高亮",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+		"message": "高亮"
 	},
 	"styleRegexpPartialExplanation": {
-		"message": "这个样式有一部分正则表达式与 <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a>完整的 URL 不匹配。这部分样式将被忽略，可能这个样式是基于 Stylish 编写的，请尝试在 Stylus 重新编写该样式。",
-		"description": ""
+		"message": "这个样式有一部分正则表达式与 <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a>完整的 URL 不匹配。这部分样式将被忽略，可能这个样式是基于 Stylish 编写的，请尝试在 Stylus 重新编写该样式。"
 	},
 	"unreachableContentScript": {
-		"message": "无法读取页面，请尝试刷新。",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
+		"message": "无法读取页面，请尝试刷新。"
 	},
 	"sectionRemove": {
-		"message": "删除此部分",
-		"description": "Label for the button to remove a section"
+		"message": "删除此部分"
 	},
 	"disableAllStyles": {
-		"message": "停用所有样式",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "停用所有样式"
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "这个样式可能在本地修改过，如果强制升级更新则会覆盖修改的内容。",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+		"message": "这个样式可能在本地修改过，如果强制升级更新则会覆盖修改的内容。"
 	},
 	"undoGlobal": {
-		"message": "撤销 (全局)",
-		"description": "CSS-beautify global Undo button label"
+		"message": "撤销 (全局)"
 	},
 	"updateCompleted": {
-		"message": "更新已完成。",
-		"description": "Text that displays when an update completed"
+		"message": "更新已完成。"
 	},
 	"checkingForUpdate": {
-		"message": "正在检查更新...",
-		"description": "Text to display when checking a style for an update"
+		"message": "正在检查更新..."
 	},
 	"styleRegexpTestFull": {
-		"message": "匹配的网页标签",
-		"description": "RegExp test report: label for the fully matching expressions"
+		"message": "匹配的网页标签"
 	},
 	"manageMaxTargets": {
-		"message": "应用对象的数量",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+		"message": "应用对象的数量"
 	},
 	"manageFaviconsHelp": {
-		"message": "Stylus 使用了 https://www.google.com/s2/favicons?domain=http://add0n.com/stylus.html 方式获取图标",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+		"message": "Stylus 使用了 https://www.google.com/s2/favicons?domain=http://add0n.com/stylus.html 方式获取图标"
 	},
 	"updateCheckSkippedLocallyEdited": {
-		"message": "此样式已在本地修改过。",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+		"message": "此样式已在本地修改过。"
 	},
 	"optionsResetButton": {
-		"message": "恢复默认值",
-		"description": ""
+		"message": "恢复默认值"
 	},
 	"sectionCode": {
-		"message": "代码",
-		"description": "Label for the code for a section"
+		"message": "代码"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "添加“删除”到编辑器的菜单",
-		"description": ""
+		"message": "添加“删除”到编辑器的菜单"
 	},
 	"importReportLegendUpdatedBoth": {
-		"message": "已更新的所有信息和代码",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+		"message": "已更新的所有信息和代码"
 	},
 	"cm_smartIndent": {
-		"message": "启用智能缩进",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "启用智能缩进"
 	},
 	"styleRegexpTestButton": {
-		"message": "测试正则表达式",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
+		"message": "测试正则表达式"
 	},
 	"appliesHelp": {
-		"message": "使用“应用对象”控件来限制此部分中的代码所应用到的网址。",
-		"description": "Help text for 'applies to' section"
+		"message": "使用“应用对象”控件来限制此部分中的代码所应用到的网址。"
 	},
 	"editStyleHeading": {
-		"message": "修改样式",
-		"description": "Title of the page for editing styles"
+		"message": "修改样式"
 	},
 	"editDeleteText": {
-		"message": "删除",
-		"description": "Label for the context menu item in the editor to delete selected text"
+		"message": "删除"
 	},
 	"cm_matchHighlightSelection": {
-		"message": "选择区域",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+		"message": "选择区域"
 	},
 	"appliesUrlOption": {
-		"message": "网址",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "网址"
 	},
 	"updateAllCheckSucceededSomeEdited": {
-		"message": "如果你修改过一些样式，那它们可能被忽略更新，你可以单独检测这些样式强制升级，也可以点 再次检测所有样式强制更新。",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "如果你修改过一些样式，那它们可能被忽略更新，你可以单独检测这些样式强制升级，也可以点 再次检测所有样式强制更新。"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus 在这样的页面上不工作",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus 在这样的页面上不工作"
 	},
 	"manageOnlyUpdates": {
-		"message": "只显示可升级的样式",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
+		"message": "只显示可升级的样式"
 	},
 	"addStyleTitle": {
-		"message": "添加样式",
-		"description": "Title of the page for adding styles"
+		"message": "添加样式"
 	},
 	"importReplaceLabel": {
-		"message": "覆盖样式",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "覆盖样式"
 	},
 	"dbError": {
-		"message": "应用Stylus数据库时发生了一个错误。您想要访问包含可能的解决方案的网页吗？",
-		"description": "Prompt when a DB error is encountered"
+		"message": "应用Stylus数据库时发生了一个错误。您想要访问包含可能的解决方案的网页吗？"
 	},
 	"optionsAdvanced": {
-		"message": "高级设置",
-		"description": ""
+		"message": "高级设置"
 	},
 	"importAppendTooltip": {
-		"message": "追加已导入样式到当前样式",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
+		"message": "追加已导入样式到当前样式"
 	},
 	"editorStylesButton": {
-		"message": "查找编辑器样式",
-		"description": "Find styles for the editor"
+		"message": "查找编辑器样式"
 	},
 	"optionsOpen": {
-		"message": "打开",
-		"description": ""
+		"message": "打开"
 	},
 	"helpKeyMapHotkey": {
-		"message": "按下热键",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "按下热键"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "忽略无效的正则表达式",
-		"description": "RegExp test report: label for the invalid expressions"
+		"message": "忽略无效的正则表达式"
 	},
 	"replaceAll": {
-		"message": "全部替换",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "全部替换"
 	},
 	"importReportUnchanged": {
-		"message": "样式导入无效。",
-		"description": "Message in the report shown after importing styles"
+		"message": "样式导入无效。"
 	},
 	"optionsActions": {
-		"message": "接下来要做什么",
-		"description": ""
+		"message": "接下来要做什么"
 	},
 	"editGotoLine": {
-		"message": "跳转至行（或行:列）",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "跳转至行（或行:列）"
 	},
 	"manageOnlyLocalTooltip": {
-		"message": "（此样式无法通过 userstyles.org 页面进行安装）",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
+		"message": "（此样式无法通过 userstyles.org 页面进行安装）"
 	},
 	"checkAllUpdates": {
-		"message": "检查所有样式更新",
-		"description": "Label for the button to check all styles for updates"
+		"message": "检查所有样式更新"
 	},
 	"openOptionsManage": {
-		"message": "设置用户界面",
-		"description": "Go to Options UI"
+		"message": "设置用户界面"
 	},
 	"issuesHelp": {
-		"message": "<a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> 在已启用的这些规则中找到问题：",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "<a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> 在已启用的这些规则中找到问题："
 	},
 	"optionsCustomizeBadge": {
-		"message": "样式计数器",
-		"description": ""
+		"message": "样式计数器"
 	},
 	"importReportLegendIdentical": {
-		"message": "个相同的样式被忽略",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+		"message": "个相同的样式被忽略"
 	},
 	"optionsPopupWidth": {
-		"message": "样式管理弹出框宽度 px",
-		"description": ""
+		"message": "样式管理弹出框宽度 px"
 	},
 	"confirmNo": {
-		"message": "否",
-		"description": "'No' button in a confirm dialog"
+		"message": "否"
 	},
 	"undo": {
-		"message": "撤销",
-		"description": "Button label"
+		"message": "撤销"
 	},
 	"cm_keyMap": {
-		"message": "键盘映射",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "键盘映射"
 	},
 	"manageNewUI": {
-		"message": "启用新的样式管理界面",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
+		"message": "启用新的样式管理界面"
 	},
 	"importReportUndoneTitle": {
-		"message": "样式导入被取消",
-		"description": "Title of the message box shown after undoing the import of styles"
+		"message": "样式导入被取消"
 	},
 	"genericDisabledLabel": {
-		"message": "未启用",
-		"description": "Used in various lists/options to indicate that something is disabled"
+		"message": "未启用"
 	},
 	"cm_indentWithTabs": {
-		"message": "启用带智能缩进的标签页",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+		"message": "启用带智能缩进的标签页"
 	},
 	"replaceWith": {
-		"message": "替换用",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "替换用"
 	},
 	"deleteStyleLabel": {
-		"message": "删除",
-		"description": "Label for the button to delete a style"
+		"message": "删除"
 	},
 	"updateCheckManualUpdateForce": {
-		"message": "安装更新（将覆盖本地修改的样式）",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+		"message": "安装更新（将覆盖本地修改的样式）"
 	},
 	"optionsAdvancedExposeIframes": {
-		"message": "通过 HTML[stylus-iframe] 方式改变 iframes 的 css",
-		"description": ""
+		"message": "通过 HTML[stylus-iframe] 方式改变 iframes 的 css"
 	},
 	"addStyleLabel": {
-		"message": "编写新样式",
-		"description": "Label for the button to go to the add style page"
+		"message": "编写新样式"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "设置为 0 则关闭样式自动更新检查",
-		"description": ""
+		"message": "设置为 0 则关闭样式自动更新检查"
 	},
 	"backupButtons": {
-		"message": "备份",
-		"description": "Heading for backup"
+		"message": "备份"
 	},
 	"manageOnlyEnabled": {
-		"message": "只显示已启用的样式",
-		"description": "Checkbox to show only enabled styles"
+		"message": "只显示已启用的样式"
 	},
 	"editStyleLabel": {
-		"message": "修改",
-		"description": "Label for the button to go to the edit style page"
+		"message": "修改"
 	},
 	"cm_theme": {
-		"message": "主题",
-		"description": "Label for the style editor's CSS theme."
+		"message": "主题"
 	},
 	"backupMessage": {
-		"message": "拖放一个 json 备份文件到这个页面，即可导入数据库",
-		"description": "Message for backup"
+		"message": "拖放一个 json 备份文件到这个页面，即可导入数据库"
 	},
 	"importReportUndone": {
-		"message": "个样式被还原",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+		"message": "个样式被还原"
 	},
 	"helpKeyMapCommand": {
-		"message": "输入命令名称",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "输入命令名称"
 	},
 	"description": {
-		"message": "Stylus 是一个调整网页外观的用户样式管理器。它可让您轻松地为许多热门网站网站安装主题和皮肤。",
-		"description": "Extension description"
+		"message": "Stylus 是一个调整网页外观的用户样式管理器。它可让您轻松地为许多热门网站网站安装主题和皮肤。"
 	}
 }
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index 34dfe284..fc500575 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -1,186 +1,134 @@
 {
 	"appliesToEverything": {
-		"message": "全部",
-		"description": "Text displayed for styles that apply to all sites"
+		"message": "全部"
 	},
 	"defaultTheme": {
-		"message": "默認",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
+		"message": "默認"
 	},
 	"exportLabel": {
-		"message": "導出",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+		"message": "導出"
 	},
 	"issues": {
-		"message": "問題",
-		"description": "Label for the CSSLint issues block on the style edit page"
+		"message": "問題"
 	},
 	"cm_tabSize": {
-		"message": "Tab大小",
-		"description": "Label for the text box controlling tab size option for the style editor."
+		"message": "Tab大小"
 	},
 	"enableStyleLabel": {
-		"message": "啟用",
-		"description": "Label for the button to enable a style"
+		"message": "啟用"
 	},
 	"styleMissingName": {
-		"message": "請輸入名稱。",
-		"description": "Error displayed when user saves without providing a name"
+		"message": "請輸入名稱。"
 	},
 	"appliesDomainOption": {
-		"message": "該域名上的網址",
-		"description": "Option to make the style apply to the entered string as a domain"
+		"message": "該域名上的網址"
 	},
 	"checkForUpdate": {
-		"message": "檢查更新",
-		"description": "Label for the button to check a single style for an update"
+		"message": "檢查更新"
 	},
 	"importAppendLabel": {
-		"message": "追加到樣式",
-		"description": "Label for the button to import a style and append to the existing sections"
+		"message": "追加到樣式"
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "樣式都是最新的。",
-		"description": "Text that displays when an update all check completed and no updates are available"
+		"message": "樣式都是最新的。"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "粘貼Mozilla格式代碼",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+		"message": "粘貼Mozilla格式代碼"
 	},
 	"helpAlt": {
-		"message": "幫助",
-		"description": "Alternate text for help buttons"
+		"message": "幫助"
 	},
 	"search": {
-		"message": "搜索",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
+		"message": "搜索"
 	},
 	"confirmYes": {
-		"message": "是",
-		"description": "'Yes' button in a confirm dialog"
+		"message": "是"
 	},
 	"findStylesForSite": {
-		"message": "查找更多適合此網站的樣式",
-		"description": "Text for a link that gets a list of styles for the current site"
+		"message": "查找更多適合此網站的樣式"
 	},
 	"manageHeading": {
-		"message": "已安裝的樣式",
-		"description": "Heading for the manage page"
+		"message": "已安裝的樣式"
 	},
 	"styleBeautify": {
-		"message": "美化",
-		"description": "Label for the CSS-beautifier button on the edit style page"
+		"message": "美化"
 	},
 	"styleEnabledLabel": {
-		"message": "已啟用",
-		"description": "Label for the enabled state of styles"
+		"message": "已啟用"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla格式的樣式代碼能在火狐版Stylus使用，也可以提交至 userstyles.org 。",
-		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+		"message": "Mozilla格式的樣式代碼能在火狐版Stylus使用，也可以提交至 userstyles.org 。"
 	},
 	"sectionAdd": {
-		"message": "再添加一個樣式段",
-		"description": "Label for the button to add a section"
+		"message": "再添加一個樣式段"
 	},
 	"styleSaveLabel": {
-		"message": "保存",
-		"description": "Label for save button for style editing"
+		"message": "保存"
 	},
 	"confirmStop": {
-		"message": "停止",
-		"description": "'Stop' button in a confirm dialog"
+		"message": "停止"
 	},
 	"writeStyleForURL": {
-		"message": "此網址",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+		"message": "此網址"
 	},
 	"appliesAdd": {
-		"message": "添加",
-		"description": "Label for the button to add an 'applies' entry"
+		"message": "添加"
 	},
 	"appliesRegexpOption": {
-		"message": "匹配正則表示式的網址",
-		"description": "Option to make the style apply to the entered string as a regular expression"
+		"message": "匹配正則表示式的網址"
 	},
 	"styleInstall": {
 		"message": "安裝 '$stylename$' 到 Stylus ？",
-		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
 	"searchStyles": {
-		"message": "搜索內容",
-		"description": "Label for the search filter textbox on the Manage styles page"
+		"message": "搜索內容"
 	},
 	"disableStyleLabel": {
-		"message": "禁用",
-		"description": "Label for the button to disable a style"
+		"message": "禁用"
 	},
 	"prefShowBadge": {
-		"message": "在工具欄按鈕上顯示當前網站已生效的樣式表數目。",
-		"description": "Label for the checkbox controlling toolbar badge text."
+		"message": "在工具欄按鈕上顯示當前網站已生效的樣式表數目。"
 	},
 	"menuShowBadge": {
-		"message": "顯示生效的樣式數目",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+		"message": "顯示生效的樣式數目"
 	},
 	"cm_lineWrapping": {
-		"message": "自動換行",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
+		"message": "自動換行"
 	},
 	"styleCancelEditLabel": {
-		"message": "返回到管理頁面",
-		"description": "Label for cancel button for style editing"
+		"message": "返回到管理頁面"
 	},
 	"styleChangesNotSaved": {
-		"message": "你已經修改了此樣式，但尚未保存。",
-		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+		"message": "你已經修改了此樣式，但尚未保存。"
 	},
 	"importLabel": {
-		"message": "導入",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+		"message": "導入"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失敗: 無法訪問伺服器。",
-		"description": "Text that displays when an update check failed because the update server is unreachable"
+		"message": "更新失敗: 無法訪問伺服器。"
 	},
 	"manageFilters": {
-		"message": "過濾器",
-		"description": "Label for filters container"
+		"message": "過濾器"
 	},
 	"applyAllUpdates": {
-		"message": "應用所有更新",
-		"description": "Label for the button to apply all detected updates"
+		"message": "應用所有更新"
 	},
 	"deleteStyleConfirm": {
-		"message": "確定要刪除這個樣式嗎？",
-		"description": "Confirmation before deleting a style"
-	},
-	"confirmDelete": {
-		"message": "Delete"
-	},
-	"confirmCancel": {
-		"message": "Cancel"
+		"message": "確定要刪除這個樣式嗎？"
 	},
 	"styleBadRegexp": {
-		"message": "正規表示式無效。",
-		"description": "Validation message for a bad regexp in a style"
+		"message": "正規表示式無效。"
 	},
 	"optionsHeading": {
-		"message": "選項",
-		"description": "Heading for options section on manage page."
+		"message": "選項"
 	},
 	"appliesDisplay": {
 		"message": "適用於： $applies$",
-		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
@@ -189,7 +137,6 @@
 	},
 	"styleUpdate": {
 		"message": "你確定你要更新 '$stylename$' ？",
-		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -197,12 +144,10 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "樣式段",
-		"description": "Title for the style sections section"
+		"message": "樣式段"
 	},
 	"editStyleTitle": {
 		"message": "編輯樣式 $stylename$",
-		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -210,68 +155,49 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "樣式已是最新的。",
-		"description": "Text that displays when an update check completed and no update is available"
+		"message": "樣式已是最新的。"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "含以下前綴的網址",
-		"description": "Option to make the style apply to the entered string as a URL prefix"
+		"message": "含以下前綴的網址"
 	},
 	"searchRegexp": {
-		"message": "使用/re/句法正則表達式搜索",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
+		"message": "使用/re/句法正則表達式搜索"
 	},
 	"importReplaceTooltip": {
-		"message": "棄用當前樣式內容并用導入樣式覆蓋",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "棄用當前樣式內容并用導入樣式覆蓋"
 	},
 	"popupStylesFirst": {
-		"message": "在工具欄按鈕命令行前列出樣式",
-		"description": "Label for the checkbox controlling section order in the toolbar button menu."
+		"message": "在工具欄按鈕命令行前列出樣式"
 	},
 	"sectionHelp": {
-		"message": "樣式段讓你能在同一個樣式中定義適用於不同網段的不同代碼段。例如，僅僅一個樣式就能以一種樣式改變一個網站的主頁，同時以另一種樣式改變這個網站的其他頁面。",
-		"description": "Help text for sections"
+		"message": "樣式段讓你能在同一個樣式中定義適用於不同網段的不同代碼段。例如，僅僅一個樣式就能以一種樣式改變一個網站的主頁，同時以另一種樣式改變這個網站的其他頁面。"
 	},
 	"noStylesForSite": {
-		"message": "當前網站沒有安裝任何樣式。",
-		"description": "Text displayed when no styles are installed for the current site"
+		"message": "當前網站沒有安裝任何樣式。"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "以及更多",
-		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+		"message": "以及更多"
 	},
 	"appliesRemove": {
-		"message": "移除",
-		"description": "Label for the button to remove an 'applies' entry"
+		"message": "移除"
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Mozilla格式樣式表",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
+		"message": "Mozilla格式樣式表"
 	},
 	"writeStyleFor": {
-		"message": "編寫樣式給：",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+		"message": "編寫樣式給："
 	},
 	"replace": {
-		"message": "替換",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+		"message": "替換"
 	},
 	"appliesLabel": {
-		"message": "適用於",
-		"description": "Label for 'applies to' fields on the edit/add screen"
+		"message": "適用於"
 	},
 	"openManage": {
-		"message": "管理已安裝樣式",
-		"description": "Link to open the manage page."
+		"message": "管理已安裝樣式"
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "更新失敗: 伺服器傳回代碼 $code$。",
-		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -279,143 +205,108 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "指定",
-		"description": "Label for the button to make a style apply only to specific sites"
+		"message": "指定"
 	},
 	"installUpdate": {
-		"message": "安裝更新",
-		"description": "Label for the button to install an update for a single style"
+		"message": "安裝更新"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla格式",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+		"message": "Mozilla格式"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus 不能在諸如此類的網頁上生效。",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+		"message": "Stylus 不能在諸如此類的網頁上生效。"
 	},
 	"sectionRemove": {
-		"message": "移除樣式段",
-		"description": "Label for the button to remove a section"
+		"message": "移除樣式段"
 	},
 	"disableAllStyles": {
-		"message": "禁用所有樣式",
-		"description": "Label for the checkbox that turns all enabled styles off."
+		"message": "禁用所有樣式"
 	},
 	"undoGlobal": {
-		"message": "撤銷（全局）",
-		"description": "CSS-beautify global Undo button label"
+		"message": "撤銷（全局）"
 	},
 	"updateCompleted": {
-		"message": "更新完成。",
-		"description": "Text that displays when an update completed"
+		"message": "更新完成。"
 	},
 	"checkingForUpdate": {
-		"message": "檢查中…",
-		"description": "Text to display when checking a style for an update"
+		"message": "檢查中…"
 	},
 	"sectionCode": {
-		"message": "代碼",
-		"description": "Label for the code for a section"
+		"message": "代碼"
 	},
 	"cm_smartIndent": {
-		"message": "使用智能縮進",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+		"message": "使用智能縮進"
 	},
 	"appliesHelp": {
-		"message": "使用「適用於」控件來限制這個樣式段適用的網址。",
-		"description": "Help text for 'applies to' section"
+		"message": "使用「適用於」控件來限制這個樣式段適用的網址。"
 	},
 	"editStyleHeading": {
-		"message": "編輯樣式",
-		"description": "Title of the page for editing styles"
+		"message": "編輯樣式"
 	},
 	"appliesUrlOption": {
-		"message": "網址",
-		"description": "Option to make the style apply to the entered string as a URL"
+		"message": "網址"
 	},
 	"addStyleTitle": {
-		"message": "添加樣式",
-		"description": "Title of the page for adding styles"
+		"message": "添加樣式"
 	},
 	"importReplaceLabel": {
-		"message": "覆蓋樣式",
-		"description": "Label for the button to import and overwrite current style"
+		"message": "覆蓋樣式"
 	},
 	"dbError": {
-		"message": "使用 Stylus 資料庫時出現錯誤。你想訪問可能包含解決辦法的網頁嗎？",
-		"description": "Prompt when a DB error is encountered"
+		"message": "使用 Stylus 資料庫時出現錯誤。你想訪問可能包含解決辦法的網頁嗎？"
 	},
 	"importAppendTooltip": {
-		"message": "追加導入的樣式到當前樣式",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
+		"message": "追加導入的樣式到當前樣式"
 	},
 	"helpKeyMapHotkey": {
-		"message": "按下熱鍵",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "按下熱鍵"
 	},
 	"replaceAll": {
-		"message": "替換所有",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+		"message": "替換所有"
 	},
 	"editGotoLine": {
-		"message": "跳到行（或 line:col ）",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
+		"message": "跳到行（或 line:col ）"
 	},
 	"checkAllUpdates": {
-		"message": "檢查所有樣式更新",
-		"description": "Label for the button to check all styles for updates"
+		"message": "檢查所有樣式更新"
 	},
 	"issuesHelp": {
-		"message": "由<a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>發現啟用這些規則會產生衝突",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
+		"message": "由<a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>發現啟用這些規則會產生衝突"
 	},
 	"confirmNo": {
-		"message": "否",
-		"description": "'No' button in a confirm dialog"
+		"message": "否"
 	},
 	"undo": {
-		"message": "撤銷",
-		"description": "Button label"
+		"message": "撤銷"
 	},
 	"cm_keyMap": {
-		"message": "鍵盤映射",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
+		"message": "鍵盤映射"
 	},
 	"cm_indentWithTabs": {
-		"message": "用Tab鍵智能縮進",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+		"message": "用Tab鍵智能縮進"
 	},
 	"replaceWith": {
-		"message": "替換為",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+		"message": "替換為"
 	},
 	"deleteStyleLabel": {
-		"message": "删除",
-		"description": "Label for the button to delete a style"
+		"message": "删除"
 	},
 	"addStyleLabel": {
-		"message": "編寫新樣式",
-		"description": "Label for the button to go to the add style page"
+		"message": "編寫新樣式"
 	},
 	"manageOnlyEnabled": {
-		"message": "只顯示已啟用的樣式",
-		"description": "Checkbox to show only enabled styles"
+		"message": "只顯示已啟用的樣式"
 	},
 	"editStyleLabel": {
-		"message": "編輯",
-		"description": "Label for the button to go to the edit style page"
+		"message": "編輯"
 	},
 	"cm_theme": {
-		"message": "主題",
-		"description": "Label for the style editor's CSS theme."
+		"message": "主題"
 	},
 	"helpKeyMapCommand": {
-		"message": "鍵入命令名稱",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+		"message": "鍵入命令名稱"
 	},
 	"description": {
-		"message": "用Stylus（一個用戶樣式管理器）重塑網頁。 Stylus 讓你能為诸多主流網站輕鬆的安裝主題和皮膚。",
-		"description": "Extension description"
+		"message": "用Stylus（一個用戶樣式管理器）重塑網頁。 Stylus 讓你能為诸多主流網站輕鬆的安裝主題和皮膚。"
 	}
 }

From b31dec86baab720c6dff9dbfaac9dd4c12c8d67b Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 11 Jul 2017 18:03:35 +0300
Subject: [PATCH 66/94] reset L10N cache if our page is loaded before bg

---
 background.js   | 8 +++-----
 localization.js | 9 +++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/background.js b/background.js
index 5adae9e8..a2ae0627 100644
--- a/background.js
+++ b/background.js
@@ -64,12 +64,10 @@ updateIcon({id: undefined}, {});
         url: 'http://add0n.com/stylus.html'
       });
     }
-    // reset L10N cache on UI language change or update
-    const {browserUIlanguage} = tryJSONparse(localStorage.L10N) || {};
-    const UIlang = chrome.i18n.getUILanguage();
-    if (reason == 'update' || browserUIlanguage != UIlang) {
+    // reset L10N cache on update
+    if (reason == 'update') {
       localStorage.L10N = JSON.stringify({
-        browserUIlanguage: UIlang,
+        browserUIlanguage: chrome.i18n.getUILanguage(),
       });
     }
     // TODO: remove in the future
diff --git a/localization.js b/localization.js
index 2a6ac4c4..0c5f578c 100644
--- a/localization.js
+++ b/localization.js
@@ -91,7 +91,16 @@ function tNodeList(nodes) {
 
 function tDocLoader() {
   t.cache = tryJSONparse(localStorage.L10N) || {};
+
+  // reset L10N cache on UI language change
+  const UIlang = chrome.i18n.getUILanguage();
+  if (t.cache.browserUIlanguage != UIlang) {
+    t.cache = {browserUIlanguage: UIlang};
+    localStorage.L10N = JSON.stringify(t.cache);
+  }
+
   const cacheLength = Object.keys(t.cache).length;
+
   // localize HEAD
   tNodeList(document.getElementsByTagName('*'));
 

From 38605f3edec906f05a1d3b61ea372d60b717dee0 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 12 Jul 2017 08:52:40 +0300
Subject: [PATCH 67/94] fixup d2dd4ae1: strip trailing commas in "de" locale

---
 _locales/de/messages.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 62791cfc..9380bd5b 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -75,7 +75,7 @@
 		"message": "Hilfe"
 	},
 	"confirmOK": {
-		"message": "OK",
+		"message": "OK"
 	},
 	"search": {
 		"message": "Suche"
@@ -93,7 +93,7 @@
 		"message": "Installierte Styles"
 	},
 	"styleBeautify": {
-		"message": "Beautify",
+		"message": "Beautify"
 	},
 	"styleRegexpProblemTooltip": {
 		"message": "Anzahl der Bereiche wurde nicht angewendet aufgrund von nicht korrekten Verwendeten Regulären Ausdrücken 'regexp()'"
@@ -215,13 +215,13 @@
 		"message": "Setzt diese Einstellungen auf die Standard-Werte zurück."
 	},
 	"optionsCustomizeUpdate": {
-		"message": "Updates",
+		"message": "Updates"
 	},
 	"deleteStyleConfirm": {
 		"message": "Möchten Sie diesen Style wirklich löschen?"
 	},
 	"optionsCustomizePopup": {
-		"message": "Popup",
+		"message": "Popup"
 	},
 	"styleBadRegexp": {
 		"message": "Regulärer Ausdruck ist ungültig."
@@ -349,7 +349,7 @@
 		"message": "Importieren der Styles abgeschlossen."
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
+		"message": "Mozilla Format"
 	},
 	"cm_matchHighlight": {
 		"message": "Hervorheben"
@@ -394,7 +394,7 @@
 		"message": "Optionen zurücksetzten"
 	},
 	"sectionCode": {
-		"message": "Code",
+		"message": "Code"
 	},
 	"optionsAdvancedContextDelete": {
 		"message": "'Löschen' im Editor Context-Menü hinzufügen"
@@ -421,7 +421,7 @@
 		"message": "Nur die Auswahl"
 	},
 	"appliesUrlOption": {
-		"message": "URL",
+		"message": "URL"
 	},
 	"updateAllCheckSucceededSomeEdited": {
 		"message": "Einige Styles wurden nicht Aktualisiert um einen Datenverlust vorzubeugen. Die Aktualisierungen können durch eine manuelle Überprüfung erzwungen werden oder für alle verbliebenen Styles durch das ausführen der erzwungenen Aktualisierung (Lokal Bearbeitungen werden überschrieben)."
@@ -541,7 +541,7 @@
 		"message": "Bearbeiten"
 	},
 	"cm_theme": {
-		"message": "Theme",
+		"message": "Theme"
 	},
 	"backupMessage": {
 		"message": "Wähle eine Datei aus oder ziehe die Datei auf diese Seite. (Drag and Drop)"

From 50a2b5dd72afcb35642633f124f46a2a72171fe5 Mon Sep 17 00:00:00 2001
From: Jeremy Schomery <jeremy.schomery@yahoo.com>
Date: Wed, 12 Jul 2017 11:44:37 +0430
Subject: [PATCH 68/94] Updating locales from transifex

---
 _locales/ar/messages.json    |  692 ++++++++++++++++++++--
 _locales/cs/messages.json    |  647 +++++++++++++++++---
 _locales/de/messages.json    |  557 +++++++++++------
 _locales/el/messages.json    |  667 +++++++++++++++++++--
 _locales/es/messages.json    |  556 +++++++++++------
 _locales/fi/messages.json    |  688 +++++++++++++++++++--
 _locales/fr/messages.json    |  673 +++++++++++++++++++--
 _locales/it/messages.json    |  693 ++++++++++++++++++++--
 _locales/ja/messages.json    |  692 ++++++++++++++++++++--
 _locales/nl/messages.json    |  641 +++++++++++++++++---
 _locales/pt_BR/messages.json |  692 ++++++++++++++++++++--
 _locales/ru/messages.json    |  557 +++++++++++------
 _locales/sr/messages.json    | 1082 ++++++++++++++++++++++++----------
 _locales/sv/messages.json    |  667 +++++++++++++++++++--
 _locales/tr/messages.json    |  693 ++++++++++++++++++++--
 _locales/zh/messages.json    |  684 +++++++++++++++++++--
 _locales/zh_CN/messages.json |  556 +++++++++++------
 _locales/zh_TW/messages.json |  639 +++++++++++++++++---
 manifest.json                |    2 +-
 19 files changed, 10299 insertions(+), 1779 deletions(-)

diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index da130415..0472f9ff 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -1,82 +1,354 @@
 {
 	"appliesToEverything": {
-		"message": "كل شيء"
+		"message": "كل شيء",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "default",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Export",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
+	},
+	"cm_tabSize": {
+		"message": "Tab size",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "تمكين"
+		"message": "تمكين",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "أدخل اسمًا."
+		"message": "أدخل اسمًا.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "عناوين URL في النطاق"
+		"message": "عناوين URL في النطاق",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "البحث عن تحديث"
+		"message": "البحث عن تحديث",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
+	},
+	"updateAllCheckSucceededNoUpdate": {
+		"message": "No updates found.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "مساعدة"
+		"message": "مساعدة",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Yes",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "البحث عن المزيد من الأنماط لموقع الويب هذا"
+		"message": "البحث عن المزيد من الأنماط لموقع الويب هذا",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "الأنماط المثبتة"
+		"message": "الأنماط المثبتة",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "ممكّن"
+		"message": "ممكّن",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "يمكن استخدام تنسيق موزيلا للرمز باستخدام Stylus للمتصفح فايرفوكس ويمكن إرساله إلى userstyles.org."
+		"message": "يمكن استخدام تنسيق موزيلا للرمز باستخدام Stylus للمتصفح فايرفوكس ويمكن إرساله إلى userstyles.org.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "إضافة قسم آخر"
+		"message": "إضافة قسم آخر",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "حفظ"
+		"message": "حفظ",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
+	},
+	"writeStyleForURL": {
+		"message": "this URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "إضافة"
+		"message": "إضافة",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "عناوين URL التي تطابق regexp"
+		"message": "عناوين URL التي تطابق regexp",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "هل تريد تثبيت '$stylename$' في Stylus؟",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "تعطيل"
+		"message": "تعطيل",
+		"description": "Label for the button to disable a style"
+	},
+	"prefShowBadge": {
+		"message": "Number of styles active for the current site",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "Show active style count",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+	},
+	"cm_lineWrapping": {
+		"message": "Word wrap",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "رجوع للإدارة"
+		"message": "رجوع للإدارة",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "لقد أجريت تغييرات على هذا النمط بدون حفظها."
+		"message": "لقد أجريت تغييرات على هذا النمط بدون حفظها.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "أخفق التحديث - الخادم يتعذر الوصول إليه."
+		"message": "أخفق التحديث - الخادم يتعذر الوصول إليه.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "Filters",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "Apply all updates",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "هل تريد بالتأكيد حذف هذا النمط؟"
+		"message": "هل تريد بالتأكيد حذف هذا النمط؟",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
+	},
+	"styleBadRegexp": {
+		"message": "Regexp is invalid.",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "Options",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "ينطبق على: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
+	"styleUpdate": {
+		"message": "Are you sure you want to update '$stylename$'?",
+		"description": "Confirmation when updating a style",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
 	"styleSectionsTitle": {
-		"message": "الأقسام"
+		"message": "الأقسام",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "تعديل النمط $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -84,31 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "النمط محدّث."
+		"message": "النمط محدّث.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "عناوين URL البادئة بـ"
+		"message": "عناوين URL البادئة بـ",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
+	},
+	"popupStylesFirst": {
+		"message": "Styles before commands",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "تتيح لك الأقسام تحديد أجزاء مختلفة من الرمز لتطبيقها على مجموعات مختلفة من عناوين URL بالنمط نفسه. فعلى سبيل المثال، يمكن لنمط مفرد تغيير الصفحة الرئيسية لموقع ويب بطريقة، مع تغيير بقية أجزاء موقع الويب بطريقة أخرى."
+		"message": "تتيح لك الأقسام تحديد أجزاء مختلفة من الرمز لتطبيقها على مجموعات مختلفة من عناوين URL بالنمط نفسه. فعلى سبيل المثال، يمكن لنمط مفرد تغيير الصفحة الرئيسية لموقع ويب بطريقة، مع تغيير بقية أجزاء موقع الويب بطريقة أخرى.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "لم يتم تثبيت أي أنماط لموقع الويب هذا."
+		"message": "لم يتم تثبيت أي أنماط لموقع الويب هذا.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "والمزيد"
+		"message": "والمزيد",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "إزالة"
+		"message": "إزالة",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "Write style for: ",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "ينطبق على"
+		"message": "ينطبق على",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "إدارة الأنماط المثبتة"
+		"message": "إدارة الأنماط المثبتة",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "أخفق التحديث - استجاب الخادم بالرمز $code$",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -116,48 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "تحديد"
+		"message": "تحديد",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "تثبيت التحديث"
+		"message": "تثبيت التحديث",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "إزالة القسم"
+		"message": "إزالة القسم",
+		"description": "Label for the button to remove a section"
+	},
+	"disableAllStyles": {
+		"message": "Turn all styles off",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "اكتمل التحديث."
+		"message": "اكتمل التحديث.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "جارٍ البحث..."
+		"message": "جارٍ البحث...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "الرمز"
+		"message": "الرمز",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "Use smart indentation",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "استخدم عناصر تحكم 'ينطبق على' لتقييد عناوين URL التي ينطبق عليها الرمز في هذا القسم."
+		"message": "استخدم عناصر تحكم 'ينطبق على' لتقييد عناوين URL التي ينطبق عليها الرمز في هذا القسم.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "تعديل النمط"
+		"message": "تعديل النمط",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
 	"appliesUrlOption": {
-		"message": "عنوان URL"
+		"message": "عنوان URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus doesn't work on pages like this.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "إضافة نمط"
+		"message": "إضافة نمط",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"dbError": {
+		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "Goto line (or line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "البحث عن تحديثات لكل الأنماط"
+		"message": "البحث عن تحديثات لكل الأنماط",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Keymap",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "Use tabs with smart indentation",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "حذف"
+		"message": "حذف",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "كتابة نمط جديد"
+		"message": "كتابة نمط جديد",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "Only enabled styles",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "تعديل"
+		"message": "تعديل",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Type a command name",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "يمكنك تغيير نمط الويب باستخدام Stylus، وهي أداة لإدارة أنماط المستخدم. وتتيح Stylus لك بسهولة تثبيت المظاهر والأشكال الخارجية لكل من Google، وFacebook وYouTube وOrkut فضلاً عن الكثير جدًا من مواقع الويب الأخرى."
+		"message": "يمكنك تغيير نمط الويب باستخدام Stylus، وهي أداة لإدارة أنماط المستخدم. وتتيح Stylus لك بسهولة تثبيت المظاهر والأشكال الخارجية لكل من Google، وFacebook وYouTube وOrkut فضلاً عن الكثير جدًا من مواقع الويب الأخرى.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 064ed161..25aae826 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -1,145 +1,337 @@
 {
 	"appliesToEverything": {
-		"message": "Vše"
+		"message": "Vše",
+		"description": "Text displayed for styles that apply to all sites"
 	},
 	"defaultTheme": {
-		"message": "výchozí"
+		"message": "výchozí",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "Seznam shod otevřených listů (klepnutím na URL zaměříte daný list)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Exportovat styly",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automaticky vyhledávat a instalovat aktualizace stylů (interval je v hodinách)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Stiskem Alt + Enter můžete zapnout/vypnout a uložit styl",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
 	},
 	"exportLabel": {
-		"message": "Exportovat"
+		"message": "Exportovat",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
 	"issues": {
-		"message": "Problémy"
+		"message": "Problémy",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Barva pozadí",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "Historie aktualizací",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Velikost tabulátorů"
+		"message": "Velikost tabulátorů",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Povolit"
+		"message": "Povolit",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Zadejte název."
+		"message": "Zadejte název.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "Historie",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Nastavit klávesové zkratky",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URL adresy na doméně"
+		"message": "URL adresy na doméně",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Zkontrolovat aktualizace"
+		"message": "Zkontrolovat aktualizace",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Styl nebyl použit kvůli nesprávnému použití „regexp()“",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Některá „regexp()“ pravidla nelze vůbec sestavit.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Tmavé vzhledy",
+		"description": ""
 	},
 	"importAppendLabel": {
-		"message": "Připojit ke stylu"
+		"message": "Připojit ke stylu",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Spravovat styly",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Všechny styly jsou aktuální."
+		"message": "Aktualizace nenalezeny.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "přidáno",
+		"description": "Text after the number of styles added in the report shown after importing styles"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Vložit kód v Mozilla-formátu"
+		"message": "Vložte kód v Mozilla formátu",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Pro import upusťte soubor zálohy kdekoliv na této stránce.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Nápověda"
+		"message": "Nápověda",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
 	},
 	"search": {
-		"message": "Vyhledat"
+		"message": "Vyhledat",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Zešednutí",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
 	},
 	"confirmYes": {
-		"message": "Ano"
+		"message": "Ano",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Najít styly pro tento web"
+		"message": "Najít styly pro tento web",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Nainstalované Styly"
+		"message": "Nainstalované styly",
+		"description": "Heading for the manage page"
 	},
 	"styleBeautify": {
-		"message": "Zkrášlit"
+		"message": "Zkrášlit",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Počet sekcí nepoužitých kvůli nesprávnému použití „regexp()“",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Povolen"
+		"message": "Povolen",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla formát umožní použití stylu v prohlížeči Mozilla Firefox a jeho odeslání na userstyles.org."
+		"message": "Kód v Mozilla formátu může být odeslán na userstyles.org a použit v aplikaci Stylish pro Firefox",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Přidat další sekci"
+		"message": "Přidat další sekci",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Shoda je nepřesná, proto přeskočeno",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Uložit"
+		"message": "Uložit",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Smazat",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Storno",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Importovat styly",
+		"description": ""
 	},
 	"confirmStop": {
-		"message": "Zastavit"
+		"message": "Zastavit",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "tato URL"
+		"message": "tuto URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "Další možnosti",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Přidat"
+		"message": "Přidat",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URL adresy odpovídající reg. výrazu"
+		"message": "URL adresy odpovídající reg. výrazu",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Povolení speciální iframe CSS syntaxe jako např. „html[stylus-iframe] h1 { display:none }“",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "kód aktualizován",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
-		"message": "Nainstalovat '$stylename$' do Stylus?",
+		"message": "Nainstalovat „$stylename$“ do Stylus?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Barva pozadí při zakázání",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Aktualizovat styly",
+		"description": ""
+	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Získat styly na userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Získat pomoc</a>"
+		"message": "<a href='https://userstyles.org'>Získat styly na userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Nápověda</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Pouze lokální styly",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"searchStyles": {
-		"message": "Prohledat obsah"
+		"message": "Prohledat obsah",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "Importujete-li zálohy stylů ze starší verze nebo z rozšíření Stylish, proveďte jednorázovou ruční kontrolu aktualizací ve správci stylů, aby byly všechny styly aktuální.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Vynutit aktualizaci (neprovedeny žádné změny stylů)",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus může přistupovat k file:// URL pouze při povolení odpovídající možnosti pro rozšíření Stylus ve správci chrome://extensions.",
+		"description": "Note in the toolbar popup for file:// URLs"
 	},
 	"disableStyleLabel": {
-		"message": "Zakázat"
+		"message": "Zakázat",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Zobrazit počet aktivních stylů pro současnou stránku u tlačítka v panelu nástrojů"
+		"message": "Počet aktivních stylů pro současnou stránku",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicony v části „Platí pro“ ",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "Zobrazit počet aktivních stylů"
+		"message": "Zobrazit počet aktivních stylů",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "Zalamování slov"
+		"message": "Zalamování slov",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Zpět ke správě"
+		"message": "Zpět ke správě",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Provedli jste změny tohoto stylu bez uložení."
+		"message": "Provedli jste změny tohoto stylu bez uložení.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
 	"importLabel": {
-		"message": "Importovat"
+		"message": "Importovat",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Zkratky",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aktualizace selhala: server je nedosažitelný."
+		"message": "Aktualizace se nezdařila: server je nedosažitelný.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "Filtry"
+		"message": "Filtry",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "Použít všechny aktualizace"
+		"message": "Použít všechny aktualizace",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Obnovit výchozí nastavení",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Aktualizace",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Opravdu chcete tento styl smazat?"
+		"message": "Opravdu chcete tento styl smazat?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Vyskakovací okno",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Tento regulérní výraz je neplatný."
+		"message": "Tento regulérní výraz je neplatný.",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "Možnosti"
+		"message": "Možnosti",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Platí pro: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Světlé vzhledy",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Otevřít správce stylů",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
 	"styleUpdate": {
-		"message": "Určitě chcete aktualizovat '$stylename$'?",
+		"message": "Určitě chcete aktualizovat „$stylename$“?",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -147,10 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Sekce"
+		"message": "Sekce",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "neplatné přeskočeny",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
-		"message": "Upravit Styl $stylename$",
+		"message": "Upravit styl $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -158,49 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Styl je aktuální."
+		"message": "Styl je aktuální.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL adresy začínající"
+		"message": "URL adresy začínající",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Stopa pod kurzorem",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
 	},
 	"searchRegexp": {
-		"message": "Použít /re/ syntaxi pro vyhledávání s regulérními výrazy"
+		"message": "Použijte /re/ syntaxi pro vyhledávání s regulérními výrazy",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Vynucení aktualizace přepíše všechny lokální úpravy.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Přepnout styl",
+		"description": "Label for the checkbox to enable/disable a style"
 	},
 	"importReplaceTooltip": {
-		"message": "Zahodit obsah současného stylu a přepsat ho importovaným stylem"
+		"message": "Zahodit obsah současného stylu a přepsat ho importovaným stylem",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Dvojklikem maximalizujete/obnovíte výšku",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "Vypsat styly před příkazy v menu pod tlačítkem na panelu nástrojů"
+		"message": "Styly před příkazy",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Pomocí sekcí můžete v jednom stylu nadefinovat více částí kódu pro různé skupiny URL adres. Jeden styl pak může např. změnit hlavní stránku webu jinak, než jeho zbytek."
+		"message": "Pomocí sekcí můžete v jednom stylu nadefinovat více částí kódu pro různé skupiny URL adres. Jeden styl pak může např. změnit hlavní stránku webu jinak, než jeho zbytek.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Pro tento web není nainstalován žádný styl."
+		"message": "Pro tento web není nainstalován žádný styl.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "a další"
+		"message": "a další",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Odstranit"
+		"message": "Odstranit",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Instalované aktualizace:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Styl v Mozilla formátu"
+		"message": "Styl v Mozilla formátu",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "Napsat nový styl"
+		"message": "Napsat nový styl pro:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
 	"replace": {
-		"message": "Nahradit"
+		"message": "Nahradit",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "Žádné odpovídající listy",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "meta informace aktualizována",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Platí pro"
+		"message": "Platí pro",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Možnosti",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Spravovat nainstalovné styly"
+		"message": "Spravovat",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Aktualizace selhala: server opověděl kódem $code$.",
+		"message": "Aktualizace se nezdařila: server odpověděl kódem $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -208,105 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specifikovat"
+		"message": "Specifikovat",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Nainstalovat aktualizaci"
+		"message": "Nainstalovat aktualizaci",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Vyhledávat a instalovat všechny aktualizace",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Import stylů dokončen",
+		"description": "Title of the report shown after importing styles"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla Formát"
+		"message": "Mozilla formát",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus nefunguje na těchto stránkách."
+	"cm_matchHighlight": {
+		"message": "Zvýraznění",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "Tento styl obsahuje částečnou regexp shodu, která je však v rozporu s <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specifikací</a>, která vyžaduje přesnou shodu URL adresy. Dotčené CSS části nebyly na stránku použity. Tento styl byl pravděpodobně vytvořen v rozšíření Stylish pro Chrome, které nesprávně kontroluje regexp() pravidla již od své první verze (známá chyba).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Odsadit @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Se stránkou nelze komunikovat. Zkuste znovu načíst list.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Odstranit sekci"
+		"message": "Odstranit sekci",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Vypnout všechny styly."
+		"message": "Vypnout všechny styly",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "Tento styl mohl být upraven lokálně.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
 	},
 	"undoGlobal": {
-		"message": "Zpět (globálně)"
+		"message": "Zpět ve všech sekcích",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Ikona na panelu nástrojů",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Aktalizace dokončena."
+		"message": "Aktalizace dokončena.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Kontroluji..."
+		"message": "Kontrola…",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Odpovídající listy",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Počet položek v části „Platí pro“",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus používá externí službu https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "Tento styl byl upraven lokálně.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Obnovit nastavení",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Kód"
+		"message": "Kód",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Přidat tlačítko Smazat do kontextové nabídky v editoru",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "meta informace a kód aktualizován",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "Použít chytré odsazení"
+		"message": "Použít chytré odsazení",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "Otestovat RegExp",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Nastavte 'Platí pro', pokud chcete limitovat, na které URL adresy se použije kód v této sekci."
+		"message": "Nastavte „Platí pro“, pokud chcete omezit působnost kódu v této sekci na určité URL adresy.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Upravit Styl"
+		"message": "Upravit styl",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Smazat",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Automatické dokončování během psaní",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "Jako bezpečností opatření, prohlížeč brání rozšířením v ovlivnění vestavěných stránek (např. chrome://version nebo about:addons) a stránek dalších rozšíření. Každý prohlížeč také omezuje přístup do vlastního obchodu s rozšířeními (např. Chrome Web Store nebo AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Pouze výběr",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL adresa",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Některé aktualizovatelné styly nebyly aktualizovány kvůli zabránění ztrátám možných lokálních změn. Aktualizace může být vynucena individuálně nebo spuštěním další aktualizace všech stylů (lokální změny mohou být přepsány).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus nepracuje se stránkami jako je tato.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Pouze s aktualizacemi nebo chybami",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Přidat Styl"
+		"message": "Přidat styl",
+		"description": "Title of the page for adding styles"
 	},
 	"importReplaceLabel": {
-		"message": "Přepsat styl"
+		"message": "Přepsat styl",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "Nastala chyba při používání Stylus databáze. Chcete navštívit webovou stránku s možnými řešeními?"
+		"message": "Nastala chyba při používání Stylus databáze. Chcete navštívit webovou stránku s možnými řešeními?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Pokročilé",
+		"description": ""
 	},
 	"importAppendTooltip": {
-		"message": "Připojit importovaný styl k současnému stylu"
+		"message": "Připojit importovaný styl k současnému stylu",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Najít styly pro editor",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Otevřít",
+		"description": ""
 	},
 	"helpKeyMapHotkey": {
-		"message": "Stiskněte kláves. zkratku"
+		"message": "Stiskněte kláves. zkratku",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Neplatné regexp přeskočeny",
+		"description": "RegExp test report: label for the invalid expressions"
 	},
 	"replaceAll": {
-		"message": "Nahradit vše"
+		"message": "Nahradit vše",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Žádné změny.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Akce",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "Přejít na řádek (nebo na line:col)"
+		"message": "Přejít na řádek (nebo na line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(styly nenainstalované prostřednictvím webu userstyles.org)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Aktualizovat všechny styly"
+		"message": "Aktualizovat všechny styly",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Možnosti rozhraní",
+		"description": "Go to Options UI"
 	},
 	"issuesHelp": {
-		"message": "Problémy nalezené aplikací <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> s těmito povolenými pravidly:"
+		"message": "Problémy nalezené aplikací <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> s těmito povolenými pravidly:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Ikona tlačítka na panelu",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identické přeskočeny",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Šířka vyskakovacího okna [px]",
+		"description": ""
 	},
 	"confirmNo": {
-		"message": "Ne"
+		"message": "Ne",
+		"description": "'No' button in a confirm dialog"
 	},
 	"undo": {
-		"message": "Zpět"
+		"message": "Zpět",
+		"description": "Button label"
 	},
 	"cm_keyMap": {
-		"message": "Přiřazení kláves"
+		"message": "Přiřazení kláves",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "Nové rozložení správy rozhraní",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import byl přerušen",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Zakázáno",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "Použít tabulátory s chytrým odsazením"
+		"message": "Použít tabulátory s chytrým odsazením",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
 	"replaceWith": {
-		"message": "Nahradit s"
+		"message": "Nahradit s",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Smazat"
+		"message": "Smazat",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Instalovat aktualizaci (lokální změny budou přepsány)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Obnažit iframe prvky pomocí HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Napsat nový styl"
+		"message": "Napsat nový styl",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "Pro vypnutí automatického vyhledávání aktualizací stylů nastavte interval na nulu.",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Zálohovat",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "Pouze povolené styly"
+		"message": "Pouze povolené styly",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Upravit"
+		"message": "Upravit",
+		"description": "Label for the button to go to the edit style page"
 	},
 	"cm_theme": {
-		"message": "Schéma"
+		"message": "Schéma",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Vyberte soubor nebo ho přetáhněte na tuto stránku.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styly navráceny zpět",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "Napište název příkazu"
+		"message": "Napište název příkazu",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Přestylujte web pomocí Stylus, manažeru uživatelských stylů. Stylus vám umožní nainstalovat témata a skiny pro mnoho populárních webů."
+		"message": "Změňte vzhled webů pomocí správce uživatelských stylů. Stylus umožňuje snadnou instalaci vzhledů a modifikací pro spoustu webů.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 9380bd5b..113fd405 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -1,150 +1,207 @@
 {
 	"appliesToEverything": {
-		"message": "Alles"
+		"message": "Alles",
+		"description": "Text displayed for styles that apply to all sites"
 	},
 	"defaultTheme": {
-		"message": "Standard"
+		"message": "Standard",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
 	},
 	"styleRegexpTestTitle": {
-		"message": "Liste der zutreffenden, geöffneten Tabs (URL anklicken um den Tab zu fokussieren)"
+		"message": "Liste der zutreffenden, geöffneten Tabs (URL anklicken, um den Tab zu fokussieren)",
+		"description": "RegExp test report: title of the report"
 	},
 	"bckpInstStyles": {
-		"message": "Styles Exportieren"
+		"message": "Styles Exportieren",
+		"description": ""
 	},
 	"optionsUpdateInterval": {
-		"message": "Automatischer Update- und Installations-Intervall (in Stunden)"
+		"message": "Automatischer Update- und Installations-Intervall (in Stunden)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Drücke Alt-Enter, um den Style zu aktivieren / deaktivieren und gleichzeitig zu speichern.",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
 	},
 	"exportLabel": {
-		"message": "Exportieren"
+		"message": "Exportieren",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
 	"issues": {
-		"message": "Probleme"
+		"message": "Probleme",
+		"description": "Label for the CSSLint issues block on the style edit page"
 	},
 	"optionsBadgeNormal": {
-		"message": "Hintergrundfarbe"
+		"message": "Hintergrundfarbe",
+		"description": ""
 	},
 	"updateCheckHistory": {
-		"message": "Verlauf der Aktualisierungs-Überprüfungen"
+		"message": "Verlauf der Aktualisierungs-Überprüfungen",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Tab-Größe"
+		"message": "Tab-Größe",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Aktivieren"
+		"message": "Aktivieren",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Bitte einen Namen eingeben."
+		"message": "Bitte einen Namen eingeben.",
+		"description": "Error displayed when user saves without providing a name"
 	},
 	"genericHistoryLabel": {
-		"message": "Verlauf"
+		"message": "Verlauf",
+		"description": "Used in various places to show a history log of something"
 	},
 	"shortcutsNote": {
-		"message": "Eine Tastenkombination definieren"
+		"message": "Eine Tastenkombination definieren",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URLs auf der Domain"
+		"message": "URLs auf der Domain",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Nach Aktualisierungen suchen"
+		"message": "Nach Aktualisierungen suchen",
+		"description": "Label for the button to check a single style for an update"
 	},
 	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style wurde aufgrund der nicht gültigen Verwendung der Regulären Ausdrücke 'regexp()' nicht angewandt."
+		"message": "Der Style wurde aufgrund ungültiger Regulärer Ausdrücke nicht angewandt.",
+		"description": "Tooltip in the popup for styles that were not applied at all"
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "Einige Regeln der Regulären Ausdrücke 'regexp()' konnten nicht überprüft werden."
+		"message": "Einige Regeln der Regulären Ausdrücke konnten nicht überprüft werden.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dunkle Browser-Themes",
+		"description": ""
 	},
 	"importAppendLabel": {
-		"message": "Zum Style anfügen"
+		"message": "Zum Style anfügen",
+		"description": "Label for the button to import a style and append to the existing sections"
 	},
 	"optionsOpenManager": {
-		"message": "Verwaltung"
+		"message": "Verwaltung",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Keine Aktualisierung gefunden"
+		"message": "Keine Aktualisierung gefunden",
+		"description": "Text that displays when an update all check completed and no updates are available"
 	},
 	"importReportLegendAdded": {
-		"message": "Hinzugefügt"
+		"message": "Hinzugefügt",
+		"description": "Text after the number of styles added in the report shown after importing styles"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Mozilla Format Code einfügen"
+		"message": "Mozilla-Format Code einfügen",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
 	},
 	"dragDropMessage": {
-		"message": "Ziehe die Backup Datei zum importieren an irgendeinen Ort auf dieser Seite."
+		"message": "Ziehe die Backup Datei zum importieren an irgendeinen Ort auf dieser Seite.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Hilfe"
+		"message": "Hilfe",
+		"description": "Alternate text for help buttons"
 	},
 	"confirmOK": {
-		"message": "OK"
+		"message": "OK",
+		"description": ""
 	},
 	"search": {
-		"message": "Suche"
+		"message": "Suche",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
 	},
 	"manageFaviconsGray": {
-		"message": "Ausgegraut"
+		"message": "Ausgegraut",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
 	},
 	"confirmYes": {
-		"message": "Ja"
+		"message": "Ja",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Weitere Styles für diese Webseite finden"
+		"message": "Weitere Styles für diese Seite finden",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Installierte Styles"
+		"message": "Installierte Styles",
+		"description": "Heading for the manage page"
 	},
 	"styleBeautify": {
-		"message": "Beautify"
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
 	},
 	"styleRegexpProblemTooltip": {
-		"message": "Anzahl der Bereiche wurde nicht angewendet aufgrund von nicht korrekten Verwendeten Regulären Ausdrücken 'regexp()'"
+		"message": "Anzahl der Bereiche, welche aufgrund nicht korrekt verwendeter Regulärer Ausdrücke nicht angewendet wurden.",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Aktiviert"
+		"message": "Aktiviert",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Das Mozilla-Format des Codes kann mit Stylish für Firefox verwendet werden und bei userstyles.org eingereicht werden."
+		"message": "Das Mozilla-Format des Codes kann mit Stylish für Firefox verwendet werden und bei userstyles.org eingereicht werden.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Weiteren Bereich hinzufügen"
+		"message": "Weiteren Bereich hinzufügen",
+		"description": "Label for the button to add a section"
 	},
 	"styleRegexpTestPartial": {
-		"message": "Kein genau Übereinstimmung, wurden daher übersprungen."
+		"message": "Keine genaue Übereinstimmung, wurde daher übersprungen.",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Speichern"
+		"message": "Speichern",
+		"description": "Label for save button for style editing"
 	},
 	"confirmDelete": {
-		"message": "Löschen"
+		"message": "Löschen",
+		"description": ""
 	},
 	"confirmCancel": {
-		"message": "Abbrechen"
+		"message": "Abbrechen",
+		"description": ""
 	},
 	"retrieveBckp": {
-		"message": "Styles Importieren"
+		"message": "Styles Importieren",
+		"description": ""
 	},
 	"confirmStop": {
-		"message": "Stopp"
+		"message": "Stopp",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "diese URL"
+		"message": "diese URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
 	"optionsSubheading": {
-		"message": "Mehr Optionen"
+		"message": "Mehr Optionen",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Hinzufügen"
+		"message": "Hinzufügen",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URLs, die mit dem Regulären Ausdrücken übereinstimmen"
+		"message": "URLs, die mit dem Regulären Ausdruck übereinstimmen",
+		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "Aktiviert die Iframe-spezifische CSS Auszeichnung wie 'html[stylus-iframe] h1 { display:none; }'"
+		"message": "Aktiviert die iFrame-spezifische CSS Auszeichnung wie 'html[stylus-iframe] h1 { display:none; }'",
+		"description": ""
 	},
 	"importReportLegendUpdatedCode": {
-		"message": "Aktualisierter Code"
+		"message": "Aktualisierter Code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "\"$stylename$\" in Stylus installieren?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -152,96 +209,129 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "Hintergrundfarbe wenn deaktiviert."
+		"message": "Hintergrundfarbe wenn deaktiviert.",
+		"description": ""
 	},
 	"optionsCheck": {
-		"message": "Styles aktualisieren"
+		"message": "Styles aktualisieren",
+		"description": ""
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Styles von userstyles.org beziehen</a> | <a href='http://add0n.com/stylus.html'>Hilfeseite anzeigen</a>"
+		"message": "<a href='https://userstyles.org'>Styles von userstyles.org beziehen</a> | <a href='http://add0n.com/stylus.html'>Hilfeseite anzeigen</a>",
+		"description": "Help text on the manage page"
 	},
 	"manageOnlyLocal": {
-		"message": "Nur Locale Styles anzeigen"
+		"message": "Nur lokale Styles anzeigen",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"searchStyles": {
-		"message": "Inhalte durchsuchen"
+		"message": "Inhalte durchsuchen",
+		"description": "Label for the search filter textbox on the Manage styles page"
 	},
 	"optionsUpdateImportNote": {
-		"message": "Nach dem Importieren alter Backups oder aus Stylish ist eine einmalige manuelle Überprüfung der Aktualisierungen (Updates) in der Verwaltung nötig. Dies stellt sicher das alle Styles auf dem aktuellsten Stand sind."
+		"message": "Nach dem Importieren von Styles aus einer alten Version oder von Stylish ist eine einmalige manuelle Überprüfung der Aktualisierungen (Updates) in der Verwaltung nötig. Dies stellt sicher, dass alle Styles auf dem aktuellsten Stand sind.",
+		"description": ""
 	},
 	"checkAllUpdatesForce": {
-		"message": "Nochmals überprüfen, ich habe keine Styles bearbeitet!"
+		"message": "Nochmals überprüfen, ich habe keine Styles bearbeitet!",
+		"description": "Label for the button to apply all detected updates"
 	},
 	"unreachableFileHint": {
-		"message": "Stylus kann nur auf das file:// Protokoll in der URL zugreifen wenn dies in den Einstellungen der Erweiterung festgelegt ist."
+		"message": "Stylus kann nur auf das file:// Protokoll in der URL zugreifen, wenn dies in den Einstellungen der Erweiterung unter chrome://extensions festgelegt wurde.",
+		"description": "Note in the toolbar popup for file:// URLs"
 	},
 	"disableStyleLabel": {
-		"message": "Deaktivieren"
+		"message": "Deaktivieren",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Anzahl der aktiven Styles auf der aktuellen Seiten"
+		"message": "Anzahl der aktiven Styles auf der aktuellen Seiten",
+		"description": "Label for the checkbox controlling toolbar badge text."
 	},
 	"manageFavicons": {
-		"message": "Favicons in der 'Gilt für' Spalte anzeigen"
+		"message": "Favicons in der 'Gilt für' Spalte anzeigen",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "Zählung der aktiven Styles anzeigen "
+		"message": "Zählung der aktiven Styles anzeigen ",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "Automatischer Zeilenumbruch"
+		"message": "Automatischer Zeilenumbruch",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Zurück zum Verwalten"
+		"message": "Zurück zum Verwalten",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Sie haben Änderungen an diesem Style vorgenommen, ohne diese zu speichern."
+		"message": "Du hast Änderungen an diesem Style vorgenommen, ohne diese zu speichern.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
 	"importLabel": {
-		"message": "Importieren"
+		"message": "Importieren",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"shortcuts": {
-		"message": "Tastenkürzel"
+		"message": "Tastenkürzel",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aktualisierung fehlgeschlagen: Server nicht erreichbar."
+		"message": "Update fehlgeschlagen: Server nicht erreichbar.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "Filter"
+		"message": "Filter",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "Alle Updates übernehmen "
+		"message": "Alle Updates übernehmen ",
+		"description": "Label for the button to apply all detected updates"
 	},
 	"optionsReset": {
-		"message": "Setzt diese Einstellungen auf die Standard-Werte zurück."
+		"message": "Setzt diese Einstellungen auf die Standard-Werte zurück.",
+		"description": ""
 	},
 	"optionsCustomizeUpdate": {
-		"message": "Updates"
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Möchten Sie diesen Style wirklich löschen?"
+		"message": "Möchtest Du diesen Style wirklich löschen?",
+		"description": "Confirmation before deleting a style"
 	},
 	"optionsCustomizePopup": {
-		"message": "Popup"
+		"message": "Popup",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Regulärer Ausdruck ist ungültig."
+		"message": "Regulärer Ausdruck ist ungültig.",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "Optionen"
+		"message": "Optionen",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Gilt für: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Helle Browser-Themes",
+		"description": ""
+	},
 	"openStylesManager": {
-		"message": "Style Verwaltung öffnen"
+		"message": "Style Verwaltung öffnen",
+		"description": "Label for the style maanger opener in the browser action context menu."
 	},
 	"styleUpdate": {
-		"message": "Möchten Sie '$stylename$' wirklich aktualisieren?",
+		"message": "Möchtest Du '$stylename$' wirklich aktualisieren?",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -249,13 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Bereiche"
+		"message": "Bereiche",
+		"description": "Title for the style sections section"
 	},
 	"importReportLegendInvalid": {
-		"message": "Ungültige übersprungen"
+		"message": "Ungültige übersprungen",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Style $stylename$ bearbeiten",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -263,73 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Der Style ist auf dem aktuellsten Stand."
+		"message": "Der Style ist auf dem aktuellsten Stand.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URLs beginnend mit"
+		"message": "URLs beginnend mit",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
 	"cm_matchHighlightToken": {
-		"message": "Auszeichnung unter dem Textzeiger."
+		"message": "Unter dem Textzeiger",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
 	},
 	"searchRegexp": {
-		"message": "Verwende die /re/ Syntax für Suche als Regulärer Ausdruck"
+		"message": "Verwende die /re/ Syntax zur Suche als Regulärer Ausdruck",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
 	},
 	"updateCheckManualUpdateHint": {
-		"message": "Eine erzwungene Aktualisierung wird die Lokalen Änderungen überschreiben."
+		"message": "Eine erzwungene Aktualisierung wird die Lokalen Änderungen überschreiben.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"toggleStyle": {
-		"message": "Style umschalten"
+		"message": "Style umschalten",
+		"description": "Label for the checkbox to enable/disable a style"
 	},
 	"importReplaceTooltip": {
-		"message": "Verwerfe den aktuellen Style-Inhalt und überschreibe ihn mit dem importierten"
+		"message": "Verwerfe den aktuellen Style-Inhalt und überschreibe ihn mit dem importierten",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Doppelklick, um Höhe zu maximieren / wiederherzustellen",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "Styles vor den Bedienelementen"
+		"message": "Styles vor den Bedienelementen",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Mit Bereichen können Sie unterschiedliche Code-Teile auf unterschiedliche URLs in dem gleichen Style anwenden. Beispielsweise kann über einen einzigen Style die Startseite der Website geändert werden, während für den Rest der Website andere Änderungen gelten."
+		"message": "Mit Bereichen kannst Du unterschiedliche Code-Teile auf unterschiedliche URLs in dem gleichen Style anwenden. Beispielsweise kann über einen einzigen Style die Startseite der Website geändert werden, während für den Rest der Website andere Änderungen gelten.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Für diese Webseite sind keine Styles installiert."
+		"message": "Für diese Webseite sind keine Styles installiert.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "und weitere"
+		"message": "und weitere",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Löschen"
+		"message": "Löschen",
+		"description": "Label for the button to remove an 'applies' entry"
 	},
 	"updatesCurrentlyInstalled": {
-		"message": "Installierte Aktualisierungen:"
+		"message": "Installierte Aktualisierungen:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Style im Mozilla Format"
+		"message": "Style im Mozilla Format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
 	"manageTitle": {
+		"message": "Stylus",
 		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "Style erstellen für:"
+		"message": "Style erstellen für:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
 	"replace": {
-		"message": "Ersetzen"
+		"message": "Ersetzen",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
 	},
 	"styleRegexpTestNone": {
-		"message": "Keine zutreffenden Tabs"
+		"message": "Keine zutreffenden Tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
 	},
 	"importReportLegendUpdatedMeta": {
-		"message": "Aktualisierte Meta Infos"
+		"message": "Aktualisierte Meta Infos",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Gilt für"
+		"message": "Gilt für",
+		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
 	"openOptionsPopup": {
-		"message": "Optionen"
+		"message": "Optionen",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Verwalten"
+		"message": "Verwalten",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
-		"message": "Aktualisierung fehlgeschlagen: Server hat den Fehler $code$ ausgegeben.",
+		"message": "Update fehlgeschlagen: Server antwortete mit Code $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -337,222 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Angeben"
+		"message": "Angeben",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Aktualisierung installieren"
+		"message": "Aktualisierung installieren",
+		"description": "Label for the button to install an update for a single style"
 	},
 	"optionsCheckUpdate": {
-		"message": "Alle verfügbaren Aktualisierungen Installieren."
+		"message": "Alle verfügbaren Aktualisierungen Installieren.",
+		"description": ""
 	},
 	"importReportTitle": {
-		"message": "Importieren der Styles abgeschlossen."
+		"message": "Importieren der Styles abgeschlossen.",
+		"description": "Title of the report shown after importing styles"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format"
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
 	"cm_matchHighlight": {
-		"message": "Hervorheben"
+		"message": "Hervorheben",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
 	},
 	"styleRegexpPartialExplanation": {
-		"message": "Dieser Style verwendet teilweise Übereinstimmende RegExps unter Missachtung der <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document Spezifikationen</a>, welche eine vollständig Übereinstimmende URL benötigen. Der betroffene CSS Bereich wurde nicht auf die Website angewandt. Dieser Style wurde wahrscheinlich unter Stylish für Chrome erstellt, in der seit der ersten Version eine inkorrekte Überprüfung der Reguläre Ausdrücke 'regexp()' vorhanden ist (bekannter Fehler)."
+		"message": "Dieser Style verwendet teilweise Übereinstimmende Reguläre Ausdrücke unter Missachtung der <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document Spezifikationen</a>, welche eine vollständig Übereinstimmende URL benötigen. Der betroffene CSS Bereich wurde nicht auf die Website angewandt. Dieser Style wurde wahrscheinlich unter Stylish für Chrome erstellt, in der seit der ersten Version eine inkorrekte Überprüfung der Regulären Ausdrücke vorhanden ist (bekannter Fehler).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Rücke @media / @supports ein",
+		"description": "CSS-beautifier option"
 	},
 	"unreachableContentScript": {
-		"message": "Konnte nicht mit der Seite Kommunizieren. Bitte versuchen sie die Seite erneut zuladen."
+		"message": "Konnte nicht mit der Seite kommunizieren. Bitte versuchen Sie, die Seite erneut zu laden.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Bereich entfernen"
+		"message": "Bereich entfernen",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Schalten Sie alle Stile aus"
+		"message": "Schalte alle Stile aus",
+		"description": "Label for the checkbox that turns all enabled styles off."
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "Dieser Style scheint Lokal bearbeitet worden zu sein."
+		"message": "Dieser Style scheint lokal bearbeitet worden zu sein.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
 	},
 	"undoGlobal": {
-		"message": "Rückgängig (global)"
+		"message": "Rückgängig machen in allen Bereichen",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Symbolleisten-Icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Aktualisierung abgeschlossen."
+		"message": "Aktualisierung abgeschlossen.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Suche nach Aktualisierungen..."
+		"message": "Suche nach Aktualisierungen...",
+		"description": "Text to display when checking a style for an update"
 	},
 	"styleRegexpTestFull": {
-		"message": "Zutreffende Tabs"
+		"message": "Zutreffende Tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
 	},
 	"manageMaxTargets": {
-		"message": "Anzahl der 'Gilt für' Elemente"
+		"message": "Anzahl der 'Gilt für' Elemente",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
 	},
 	"manageFaviconsHelp": {
-		"message": "Stylus nutzt hierzu den externen Dienst https://www.google.com/s2/favicons"
+		"message": "Stylus nutzt hierzu den externen Dienst https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"updateCheckSkippedLocallyEdited": {
-		"message": "Dieser Style wurde Local bearbeitet."
+		"message": "Dieser Style wurde lokal bearbeitet.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsResetButton": {
-		"message": "Optionen zurücksetzten"
+		"message": "Optionen zurücksetzten",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Code"
+		"message": "Code",
+		"description": "Label for the code for a section"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "'Löschen' im Editor Context-Menü hinzufügen"
+		"message": "'Löschen' im Editor-Kontextmenü hinzufügen",
+		"description": ""
 	},
 	"importReportLegendUpdatedBoth": {
-		"message": "Aktualisierte Meta Infos und Codes"
+		"message": "Aktualisierte Meta Infos und Codes",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "Intelligenten Einzug verwenden"
+		"message": "Intelligenten Einzug verwenden",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
 	"styleRegexpTestButton": {
-		"message": "Reguläre Ausdrücke Testen"
+		"message": "Reguläre Ausdrücke testen",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Legen Sie mit den Einstellungen von 'Gilt für' fest, für welche URLs der Code in diesem Bereich gelten soll."
+		"message": "Lege mit den Einstellungen von 'Gilt für' fest, für welche URLs der Code in diesem Bereich gelten soll.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Style bearbeiten"
+		"message": "Style bearbeiten",
+		"description": "Title of the page for editing styles"
 	},
 	"editDeleteText": {
-		"message": "Löschen"
+		"message": "Löschen",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autovervollständigen bei Eingabe",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "Der Browser verbietet als Sicherheitsvorkehrung den Zugriff der Erweiterung auf interne Seiten (wie z.B. chrome://version oder about:addons) sowie andere Erweiterungsseiten. Jeder Browser begrenzt den Zugriff auf eigene Erweiterungs-Galerien (wie z.B. den Chrome Web Store oder addons.mozilla.org).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
 	"cm_matchHighlightSelection": {
-		"message": "Nur die Auswahl"
+		"message": "Nur die Auswahl",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
 	"appliesUrlOption": {
-		"message": "URL"
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
 	},
 	"updateAllCheckSucceededSomeEdited": {
-		"message": "Einige Styles wurden nicht Aktualisiert um einen Datenverlust vorzubeugen. Die Aktualisierungen können durch eine manuelle Überprüfung erzwungen werden oder für alle verbliebenen Styles durch das ausführen der erzwungenen Aktualisierung (Lokal Bearbeitungen werden überschrieben)."
+		"message": "Einige Styles wurden nicht aktualisiert, um dem Verlust von lokalen Bearbeitungen vorzubeugen. Die Aktualisierungen können entweder durch einzelne manuelle Überprüfung oder durch eine erneute Ausführung der Aktualisierung für alle Styles erzwungen werden (Lokale Bearbeitungen werden dann überschrieben).",
+		"description": "Text that displays when an update all check completed and no updates are available"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus funktioniert nicht auf Seiten wie diesen."
+		"message": "Stylus funktioniert nicht auf Seiten wie diesen.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
 	"manageOnlyUpdates": {
-		"message": "Nur mit Aktualisierungen oder Problemen"
+		"message": "Nur mit Aktualisierungen oder Problemen",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Style hinzufügen"
+		"message": "Style hinzufügen",
+		"description": "Title of the page for adding styles"
 	},
 	"importReplaceLabel": {
-		"message": "Style überschreiben"
+		"message": "Style überschreiben",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "Ein Fehler ist beim Verwenden der Stylus-Datenbank aufgetreten. Wollen Sie eine Webseite mit möglichen Lösungen besuchen?"
+		"message": "Ein Fehler ist beim Verwenden der Stylus-Datenbank aufgetreten. Willst Du eine Webseite mit möglichen Lösungen besuchen?",
+		"description": "Prompt when a DB error is encountered"
 	},
 	"optionsAdvanced": {
-		"message": "Erweitert"
+		"message": "Erweitert",
+		"description": ""
 	},
 	"importAppendTooltip": {
-		"message": "Füge den importierten Style an den aktuellen"
+		"message": "Füge den importierten Style an den aktuellen",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
 	},
 	"editorStylesButton": {
-		"message": "Editor Styles finden"
+		"message": "Editor Styles finden",
+		"description": "Find styles for the editor"
 	},
 	"optionsOpen": {
-		"message": "Öffnen"
+		"message": "Öffnen",
+		"description": ""
 	},
 	"helpKeyMapHotkey": {
-		"message": "Hotkey drücken"
+		"message": "Hotkey drücken",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "Ungültige Reguläre Ausdrücke übersprungen"
+		"message": "Ungültige Reguläre Ausdrücke übersprungen",
+		"description": "RegExp test report: label for the invalid expressions"
 	},
 	"replaceAll": {
-		"message": "Alles ersetzen"
+		"message": "Alles ersetzen",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
 	},
 	"importReportUnchanged": {
-		"message": "Nichts wurde geändert."
+		"message": "Nichts wurde geändert.",
+		"description": "Message in the report shown after importing styles"
 	},
 	"optionsActions": {
-		"message": "Aktionen"
+		"message": "Aktionen",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "Gehe zu Zeile (oder Zeile:Zeichen)"
+		"message": "Gehe zu Zeile (oder Zeile:Zeichen)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
 	},
 	"manageOnlyLocalTooltip": {
-		"message": "(Diese Styles wurden nicht durch userstyles.org installiert)"
+		"message": "(Diese Styles wurden nicht durch userstyles.org installiert)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Nach Aktualisierungen für alle Styles suchen"
+		"message": "Nach Aktualisierungen für alle Styles suchen",
+		"description": "Label for the button to check all styles for updates"
 	},
 	"openOptionsManage": {
-		"message": "Optionen"
+		"message": "Optionen",
+		"description": "Go to Options UI"
 	},
 	"issuesHelp": {
-		"message": "Die von <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> gefunden Fehler haben die folgenden Einstellungen:"
+		"message": "Die von <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> gefunden Fehler haben die folgenden Einstellungen:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
 	},
 	"optionsCustomizeBadge": {
-		"message": "Badge auf dem Toolbar-Icon"
+		"message": "Badge auf dem Toolbar-Icon",
+		"description": ""
 	},
 	"importReportLegendIdentical": {
-		"message": "Identische übersprungen"
+		"message": "Identische übersprungen",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
 	},
 	"optionsPopupWidth": {
-		"message": "Popup breite (in pixeln)"
+		"message": "Popup-Breite (in Pixeln)",
+		"description": ""
 	},
 	"confirmNo": {
-		"message": "Nein"
+		"message": "Nein",
+		"description": "'No' button in a confirm dialog"
 	},
 	"undo": {
-		"message": "Rückgängig"
+		"message": "Rückgängig",
+		"description": "Button label"
 	},
 	"cm_keyMap": {
-		"message": "Tastaturbelegung"
+		"message": "Tastaturbelegung",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
 	},
 	"manageNewUI": {
-		"message": "Neues Verwaltungs Design-Layout."
+		"message": "Neues Verwaltungs Design-Layout.",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
 	},
 	"importReportUndoneTitle": {
-		"message": "Importierung wurde rückgängig gemacht."
+		"message": "Importierung wurde rückgängig gemacht.",
+		"description": "Title of the message box shown after undoing the import of styles"
 	},
 	"genericDisabledLabel": {
-		"message": "Deaktiviert"
+		"message": "Deaktiviert",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "Tabs mit intelligentem Einzug verwenden"
+		"message": "Tabs mit intelligentem Einzug verwenden",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
 	"replaceWith": {
-		"message": "Ersetzen durch"
+		"message": "Ersetzen durch",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Löschen"
+		"message": "Löschen",
+		"description": "Label for the button to delete a style"
 	},
 	"updateCheckManualUpdateForce": {
-		"message": "Aktualisierungen Installieren (Lokale Bearbeitungen werden überschrieben)"
+		"message": "Aktualisierungen installieren (Lokale Bearbeitungen werden überschrieben)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsAdvancedExposeIframes": {
-		"message": "Ermögliche Iframes via HTML[stylus-iframe]"
+		"message": "Ermögliche Iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Neuen Style erstellen"
+		"message": "Neuen Style erstellen",
+		"description": "Label for the button to go to the add style page"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "Zum deaktivieren der automatischen Aktualisierungs-Überprüfung den Wert auf 0 setzten."
+		"message": "Zum Deaktivieren der automatischen Aktualisierungs-Überprüfung den Wert auf 0 setzen.",
+		"description": ""
 	},
 	"backupButtons": {
-		"message": "Datensicherung"
+		"message": "Datensicherung",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "Nur aktivierte Styles"
+		"message": "Nur aktivierte Styles",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Bearbeiten"
+		"message": "Bearbeiten",
+		"description": "Label for the button to go to the edit style page"
 	},
 	"cm_theme": {
-		"message": "Theme"
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
 	},
 	"backupMessage": {
-		"message": "Wähle eine Datei aus oder ziehe die Datei auf diese Seite. (Drag and Drop)"
+		"message": "Wähle eine Datei aus oder ziehe die Datei auf diese Seite. (Drag and Drop)",
+		"description": "Message for backup"
 	},
 	"importReportUndone": {
-		"message": "Styles wiederherstellt"
+		"message": "Styles wiederherstellt",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "Befehlsnamen eingeben"
+		"message": "Befehlsnamen eingeben",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Gestalten Sie das Web mit Stylus, einem Manager für Benutzer-Styles, um. Stylus lässt Sie ganz einfach Themes und Skins für viele beliebte Webseiten installieren."
+		"message": "Gestalte das Web neu mit Stylus, dem Style Manager. Stylus ermöglicht dir ganz einfach Themes und Designs für viele populäre Websites zu installieren.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index 5272b99e..ea843696 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -1,109 +1,337 @@
 {
 	"appliesToEverything": {
-		"message": "Τα πάντα"
+		"message": "Τα πάντα",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "default",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Export",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Μέγεθος καρτέλας"
+		"message": "Μέγεθος καρτέλας",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Ενεργοποίηση"
+		"message": "Ενεργοποίηση",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Εισάγετε ένα όνομα."
+		"message": "Εισάγετε ένα όνομα.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URL στον τομέα"
+		"message": "URL στον τομέα",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Έλεγχος για ενημερώσεις"
+		"message": "Έλεγχος για ενημερώσεις",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Όλα τα στυλ είναι ενημερωμένα."
+		"message": "Όλα τα στυλ είναι ενημερωμένα.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Βοήθεια"
+		"message": "Βοήθεια",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Yes",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Αναζήτηση περισσότερων στυλ για αυτή την ιστοσελίδα"
+		"message": "Αναζήτηση περισσότερων στυλ για αυτή την ιστοσελίδα",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Εγκατεστημένα Στυλ"
+		"message": "Εγκατεστημένα Στυλ",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Ενεργοποιημένη"
+		"message": "Ενεργοποιημένη",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Η μορφή του Mozilla κώδικα μπορεί να χρησιμοποιηθεί με το Stylish για το Firefox και μπορεί να υποβληθεί στο userstyles.org."
+		"message": "Η μορφή του Mozilla κώδικα μπορεί να χρησιμοποιηθεί με το Stylish για το Firefox και μπορεί να υποβληθεί στο userstyles.org.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Προσθήκη ένος άλλου τμήματος"
+		"message": "Προσθήκη ένος άλλου τμήματος",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Αποθήκευση"
+		"message": "Αποθήκευση",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "αυτή την διεύθυνση URL"
+		"message": "αυτή την διεύθυνση URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Προσθήκη"
+		"message": "Προσθήκη",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "Διευθύνσεις URL που ταιριάζουν με την κανονική έκφραση"
+		"message": "Διευθύνσεις URL που ταιριάζουν με την κανονική έκφραση",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "Εγκατάσταση του '$stylename$' στο Stylus;",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "Απενεργοποίηση"
+		"message": "Απενεργοποίηση",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Εμφάνιση αριθμού των στυλ που δραστηριοποιούνται για την τρέχουσα τοποθεσία στην μπάρα εργαλείων"
+		"message": "Εμφάνιση αριθμού των στυλ που δραστηριοποιούνται για την τρέχουσα τοποθεσία στην μπάρα εργαλείων",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "Εμφάνιση ενεργους καταμέτρησης στυλ"
+		"message": "Εμφάνιση ενεργους καταμέτρησης στυλ",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "Αναδίπλωση λέξεων"
+		"message": "Αναδίπλωση λέξεων",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Πίσω στη διαχείριση"
+		"message": "Πίσω στη διαχείριση",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Έχετε κάνει αλλαγές σε αυτό το ύφος χωρίς αποθήκευση."
+		"message": "Έχετε κάνει αλλαγές σε αυτό το ύφος χωρίς αποθήκευση.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Αποτυχία ενημέρωσης: απρόσιτος διακομιστής."
+		"message": "Αποτυχία ενημέρωσης: απρόσιτος διακομιστής.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "Φίλτρα"
+		"message": "Φίλτρα",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "Εφαρμογή όλων των ενημερώσεων"
+		"message": "Εφαρμογή όλων των ενημερώσεων",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το στυλ;"
+		"message": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το στυλ;",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Το Regexp δεν είναι έγκυρο."
+		"message": "Το Regexp δεν είναι έγκυρο.",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "Επιλογές"
+		"message": "Επιλογές",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Ισχύει για: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
 	"styleUpdate": {
 		"message": "Είστε σίγουροι ότι θέλετε να ενημερώσετε το '$stylename$';",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -111,10 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Ενότητες"
+		"message": "Ενότητες",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Επεξεργασία του στυλ $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -122,40 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Το στυλ είναι ενημερωμένο."
+		"message": "Το στυλ είναι ενημερωμένο.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "Διευθύνσεις URL που αρχίζουν με"
+		"message": "Διευθύνσεις URL που αρχίζουν με",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "Στυλ λίστας πριν των εντολών στο μενού του κουμπιού γραμμής εργαλείων"
+		"message": "Στυλ λίστας πριν των εντολών στο μενού του κουμπιού γραμμής εργαλείων",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Ενότητες σας επιτρέπουν να ορίσετε διαφορετικά κομμάτια του κώδικα για να εφαρμόζονται σε διαφορετικά σύνολα των διευθύνσεων URL στο ίδιο στυλ. Για παράδειγμα, ένα ενιαίο ύφος θα μπορούσε να αλλάξει την αρχική σελίδα ενός ιστότοπου με έναν τρόπο, ενώ αλλάζει το υπόλοιπο μιας τοποθεσίας ένας άλλος τρόπος."
+		"message": "Ενότητες σας επιτρέπουν να ορίσετε διαφορετικά κομμάτια του κώδικα για να εφαρμόζονται σε διαφορετικά σύνολα των διευθύνσεων URL στο ίδιο στυλ. Για παράδειγμα, ένα ενιαίο ύφος θα μπορούσε να αλλάξει την αρχική σελίδα ενός ιστότοπου με έναν τρόπο, ενώ αλλάζει το υπόλοιπο μιας τοποθεσίας ένας άλλος τρόπος.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Δεν υπάρχουν εγκατεστημένα στυλ για αυτή την ιστοσελίδα."
+		"message": "Δεν υπάρχουν εγκατεστημένα στυλ για αυτή την ιστοσελίδα.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "και πολλά άλλα"
+		"message": "και πολλά άλλα",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Αφαίρεση"
+		"message": "Αφαίρεση",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
 	"manageTitle": {
-		"message": "Κομψή"
+		"message": "Κομψή",
+		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "Γράψτε νέο στυλ για:"
+		"message": "Γράψτε νέο στυλ για:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Ισχύει για"
+		"message": "Ισχύει για",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Διαχείριση εγκατεστημένων στυλ"
+		"message": "Διαχείριση εγκατεστημένων στυλ",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Αποτυχία ενημέρωσης: ο διακομιστής ανταποκρίθηκε με κωδικό $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -163,66 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Καθορισμός"
+		"message": "Καθορισμός",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Εγκατάσταση ενημέρωσης"
+		"message": "Εγκατάσταση ενημέρωσης",
+		"description": "Label for the button to install an update for a single style"
 	},
-	"stylusUnavailableForURL": {
-		"message": "To Stylus δεν λειτουργεί σε σελίδες όπως αυτή."
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Αφαίρεση ενότητας"
+		"message": "Αφαίρεση ενότητας",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Απενεργοποιηση ολων των στυλ"
+		"message": "Απενεργοποιηση ολων των στυλ",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Η ενημέρωση ολοκληρώθηκε."
+		"message": "Η ενημέρωση ολοκληρώθηκε.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Έλεγχος..."
+		"message": "Έλεγχος...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Κώδικας"
+		"message": "Κώδικας",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "Χρήση έξυπνης εσοχής"
+		"message": "Χρήση έξυπνης εσοχής",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Χρησιμοποιήστε το \"Ισχύει για\" έλεγχοι ώστε να περιοριστουν ποιες διευθύνσεις τον κώδικα σε αυτό το τμήμα να εφαρμόζονται."
+		"message": "Χρησιμοποιήστε το \"Ισχύει για\" έλεγχοι ώστε να περιοριστουν ποιες διευθύνσεις τον κώδικα σε αυτό το τμήμα να εφαρμόζονται.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Επεξεργασία Στυλ"
+		"message": "Επεξεργασία Στυλ",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "To Stylus δεν λειτουργεί σε σελίδες όπως αυτή.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Προσθήκη στυλ"
+		"message": "Προσθήκη στυλ",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "Παρουσιάστηκε σφάλμα χρησιμοποιώντας την κομψή βάση δεδομένων. Θα θέλατε να επισκεφθείτε μια ιστοσελίδα με πιθανές λύσεις;"
+		"message": "Παρουσιάστηκε σφάλμα χρησιμοποιώντας την κομψή βάση δεδομένων. Θα θέλατε να επισκεφθείτε μια ιστοσελίδα με πιθανές λύσεις;",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "Μετάβαση στη γραμμή (ή line:col)"
+		"message": "Μετάβαση στη γραμμή (ή line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Έλεγχος όλων των στυλ για ενημερώσεις"
+		"message": "Έλεγχος όλων των στυλ για ενημερώσεις",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Keymap",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "Χρήση καρτελών με έξυπνη εσοχή"
+		"message": "Χρήση καρτελών με έξυπνη εσοχή",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Διαγραφή"
+		"message": "Διαγραφή",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Γράψτε νέο στυλ"
+		"message": "Γράψτε νέο στυλ",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "Μόνο ενεργοποιημένα στυλ"
+		"message": "Μόνο ενεργοποιημένα στυλ",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Επεξεργασία"
+		"message": "Επεξεργασία",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Type a command name",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Επαναπροσδιορίση του διαδίκτυου με το  Stylus, έναν διαχειριστή στυλ. Το Stylus σας επιτρέπει να εγκαταστήσετε εύκολα themes και skins για πολλές δημοφιλείς ιστοσελίδες."
+		"message": "Επαναπροσδιορίση του διαδίκτυου με το  Stylus, έναν διαχειριστή στυλ. Το Stylus σας επιτρέπει να εγκαταστήσετε εύκολα themes και skins για πολλές δημοφιλείς ιστοσελίδες.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 42617669..9302d44a 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -1,150 +1,207 @@
 {
 	"appliesToEverything": {
-		"message": "Todos los sitios"
+		"message": "Todos los sitios",
+		"description": "Text displayed for styles that apply to all sites"
 	},
 	"defaultTheme": {
-		"message": "predeterminado"
+		"message": "predeterminado",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
 	},
 	"styleRegexpTestTitle": {
-		"message": "Lista de pestañas coincidentes abiertas (haga clic en la URL para poner el foco en esa pestaña)"
+		"message": "Lista de pestañas coincidentes abiertas (haga clic en la URL para poner el foco en esa pestaña)",
+		"description": "RegExp test report: title of the report"
 	},
 	"bckpInstStyles": {
-		"message": "Exportar estilos"
+		"message": "Exportar estilos",
+		"description": ""
 	},
 	"optionsUpdateInterval": {
-		"message": "Buscar e instalar automáticamente todas las actualizaciones disponibles de estilos de usuario (en horas)"
+		"message": "Buscar e instalar automáticamente todas las actualizaciones disponibles de estilos de usuario (en horas)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Pulse Alt-Intro para accionar el estado habilitado/deshabilitado y guardar el estilo",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
 	},
 	"exportLabel": {
-		"message": "Exportar"
+		"message": "Exportar",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
 	"issues": {
-		"message": "Problemas"
+		"message": "Problemas",
+		"description": "Label for the CSSLint issues block on the style edit page"
 	},
 	"optionsBadgeNormal": {
-		"message": "Color de fondo"
+		"message": "Color de fondo",
+		"description": ""
 	},
 	"updateCheckHistory": {
-		"message": "Historial de búsqueda de actualizaciones"
+		"message": "Historial de búsqueda de actualizaciones",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Tamaño de la pestaña"
+		"message": "Tamaño de la pestaña",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Activar"
+		"message": "Activar",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Introduzca un nombre"
+		"message": "Introduzca un nombre",
+		"description": "Error displayed when user saves without providing a name"
 	},
 	"genericHistoryLabel": {
-		"message": "Historial"
+		"message": "Historial",
+		"description": "Used in various places to show a history log of something"
 	},
 	"shortcutsNote": {
-		"message": "Defina atajos de teclado"
+		"message": "Defina atajos de teclado",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URLs en el dominio"
+		"message": "URLs en el dominio",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Buscar actualización"
+		"message": "Buscar actualización",
+		"description": "Label for the button to check a single style for an update"
 	},
 	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "El estilo no se aplicó debido a su uso incorrecto de 'regexp()'"
+		"message": "El estilo no se aplicó debido a su uso incorrecto de 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "Algunas reglas «regexp()» que no se pudieron compilar en absoluto."
+		"message": "Algunas reglas «regexp()» que no se pudieron compilar en absoluto.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Temas de navegador oscuros",
+		"description": ""
 	},
 	"importAppendLabel": {
-		"message": "Agregar al estilo"
+		"message": "Agregar al estilo",
+		"description": "Label for the button to import a style and append to the existing sections"
 	},
 	"optionsOpenManager": {
-		"message": "Administrar estilos"
+		"message": "Administrar estilos",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "No se encontraron actualizaciones."
+		"message": "No se encontraron actualizaciones.",
+		"description": "Text that displays when an update all check completed and no updates are available"
 	},
 	"importReportLegendAdded": {
-		"message": "añadidos"
+		"message": "añadidos",
+		"description": "Text after the number of styles added in the report shown after importing styles"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Pegue el código de formato Mozilla"
+		"message": "Pegue el código de formato Mozilla",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
 	},
 	"dragDropMessage": {
-		"message": "Suelte su fichero de copia de seguridad en cualquier lugar de esta página para importarlo."
+		"message": "Suelte su fichero de copia de seguridad en cualquier lugar de esta página para importarlo.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Ayuda"
+		"message": "Ayuda",
+		"description": "Alternate text for help buttons"
 	},
 	"confirmOK": {
-		"message": "Aceptar"
+		"message": "Aceptar",
+		"description": ""
 	},
 	"search": {
-		"message": "Buscar"
+		"message": "Buscar",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
 	},
 	"manageFaviconsGray": {
-		"message": "Atenuado"
+		"message": "Atenuado",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
 	},
 	"confirmYes": {
-		"message": "Sí"
+		"message": "Sí",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Encontrar más estilos para este sitio"
+		"message": "Encontrar más estilos para este sitio",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Estilos instalados"
+		"message": "Estilos instalados",
+		"description": "Heading for the manage page"
 	},
 	"styleBeautify": {
-		"message": "Embellecer"
+		"message": "Embellecer",
+		"description": "Label for the CSS-beautifier button on the edit style page"
 	},
 	"styleRegexpProblemTooltip": {
-		"message": "Número de secciones no aplicadas debido a un uso incorrecto de 'regexp()'"
+		"message": "Número de secciones no aplicadas debido a un uso incorrecto de 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Activado"
+		"message": "Activado",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "El formato Mozilla del código se puede enviar a userstyles.org y usarse con el Stylish para Firefox clásico."
+		"message": "El formato Mozilla del código se puede enviar a userstyles.org y usarse con el Stylish para Firefox clásico.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Añadir otra sección"
+		"message": "Añadir otra sección",
+		"description": "Label for the button to add a section"
 	},
 	"styleRegexpTestPartial": {
-		"message": "No completamente coincidentes, por tanto omitidos"
+		"message": "No completamente coincidentes, por tanto omitidos",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Guardar"
+		"message": "Guardar",
+		"description": "Label for save button for style editing"
 	},
 	"confirmDelete": {
-		"message": "Borrar"
+		"message": "Borrar",
+		"description": ""
 	},
 	"confirmCancel": {
-		"message": "Cancelar"
+		"message": "Cancelar",
+		"description": ""
 	},
 	"retrieveBckp": {
-		"message": "Importar estilos"
+		"message": "Importar estilos",
+		"description": ""
 	},
 	"confirmStop": {
-		"message": "Detener"
+		"message": "Detener",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "este URL"
+		"message": "este URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
 	"optionsSubheading": {
-		"message": "Más opciones"
+		"message": "Más opciones",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Añadir"
+		"message": "Añadir",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URLs coincidentes con la regexp"
+		"message": "URLs coincidentes con la regexp",
+		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "Activa la escritura de CSS específico-para-iframe como «html[stylus-iframe] h1 { display:none }»"
+		"message": "Activa la escritura de CSS específico-para-iframe como «html[stylus-iframe] h1 { display:none }»",
+		"description": ""
 	},
 	"importReportLegendUpdatedCode": {
-		"message": "código actualizado"
+		"message": "código actualizado",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "¿Quiere instalar «$stylename$» en Stylus?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -152,96 +209,129 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "Color de fondo cuando está desactivado"
+		"message": "Color de fondo cuando está desactivado",
+		"description": ""
 	},
 	"optionsCheck": {
-		"message": "Actualizar estilos"
+		"message": "Actualizar estilos",
+		"description": ""
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Obtener estilos en userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Obtener ayuda</a>"
+		"message": "<a href='https://userstyles.org'>Obtener estilos en userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Obtener ayuda</a>",
+		"description": "Help text on the manage page"
 	},
 	"manageOnlyLocal": {
-		"message": "Sólo estilos creados localmente"
+		"message": "Sólo estilos creados localmente",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"searchStyles": {
-		"message": "Buscar contenidos"
+		"message": "Buscar contenidos",
+		"description": "Label for the search filter textbox on the Manage styles page"
 	},
 	"optionsUpdateImportNote": {
-		"message": "Al importar copias de seguridad de estilos desde una versión antigua o desde Stylish, realice una única búsqueda manual de actualizaciones en el administrador de estilos para asegurarse de que todos los estilos están actualizados."
+		"message": "Al importar copias de seguridad de estilos desde una versión antigua o desde Stylish, realice una única búsqueda manual de actualizaciones en el administrador de estilos para asegurarse de que todos los estilos están actualizados.",
+		"description": ""
 	},
 	"checkAllUpdatesForce": {
-		"message": "Comprobar de nuevo, ¡no he editado ningún estilo!"
+		"message": "Comprobar de nuevo, ¡no he editado ningún estilo!",
+		"description": "Label for the button to apply all detected updates"
 	},
 	"unreachableFileHint": {
-		"message": "Stylus puede acceder a URL file:// solo si activa la casilla correspondiente para la extensión Stylus en la página chrome://extensions."
+		"message": "Stylus puede acceder a URL file:// solo si activa la casilla correspondiente para la extensión Stylus en la página chrome://extensions.",
+		"description": "Note in the toolbar popup for file:// URLs"
 	},
 	"disableStyleLabel": {
-		"message": "Desactivar"
+		"message": "Desactivar",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Número de estilos activos en el sitio actual"
+		"message": "Número de estilos activos en el sitio actual",
+		"description": "Label for the checkbox controlling toolbar badge text."
 	},
 	"manageFavicons": {
-		"message": "Favicons en la columna se-aplica-a"
+		"message": "Favicons en la columna se-aplica-a",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "Mostrar número de estilos activos"
+		"message": "Mostrar número de estilos activos",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "Ajuste de línea"
+		"message": "Ajuste de línea",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Volver al administrador"
+		"message": "Volver al administrador",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Ha realizado cambios en este estilo sin guardarlos."
+		"message": "Ha realizado cambios en este estilo sin guardarlos.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
 	"importLabel": {
-		"message": "Importar"
+		"message": "Importar",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"shortcuts": {
-		"message": "Atajos"
+		"message": "Atajos",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Error de actualización: no se pudo contactar con el servidor."
+		"message": "Error de actualización: no se pudo contactar con el servidor.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "Filtros"
+		"message": "Filtros",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "Aplicar todas las actualizaciones"
+		"message": "Aplicar todas las actualizaciones",
+		"description": "Label for the button to apply all detected updates"
 	},
 	"optionsReset": {
-		"message": "Restablecer las opciones a sus valores predeterminados."
+		"message": "Restablecer las opciones a sus valores predeterminados.",
+		"description": ""
 	},
 	"optionsCustomizeUpdate": {
-		"message": "Actualizaciones"
+		"message": "Actualizaciones",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "¿Confirma que quiere eliminar este estilo?"
+		"message": "¿Confirma que quiere eliminar este estilo?",
+		"description": "Confirmation before deleting a style"
 	},
 	"optionsCustomizePopup": {
-		"message": "Cuadro emergente"
+		"message": "Cuadro emergente",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "La expresión regular proporcionada no es válida."
+		"message": "La expresión regular proporcionada no es válida.",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "Opciones"
+		"message": "Opciones",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Se aplica a: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Temas de navegador claros",
+		"description": ""
+	},
 	"openStylesManager": {
-		"message": "Abrir administrador de estilos"
+		"message": "Abrir administrador de estilos",
+		"description": "Label for the style maanger opener in the browser action context menu."
 	},
 	"styleUpdate": {
 		"message": "¿Confirma que quiere actualizar «$stylename$»?",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -249,13 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Secciones"
+		"message": "Secciones",
+		"description": "Title for the style sections section"
 	},
 	"importReportLegendInvalid": {
-		"message": "no válidos omitidos"
+		"message": "no válidos omitidos",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Editar estilo $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -263,70 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "El estilo está actualizado."
+		"message": "El estilo está actualizado.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URLs que empiezan con"
+		"message": "URLs que empiezan con",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
 	"cm_matchHighlightToken": {
-		"message": "Resaltado de palabra señalada"
+		"message": "Resaltado de palabra señalada",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
 	},
 	"searchRegexp": {
-		"message": "Use la sintaxis /re/ para búsquedas con expresiones regulares"
+		"message": "Use la sintaxis /re/ para búsquedas con expresiones regulares",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
 	},
 	"updateCheckManualUpdateHint": {
-		"message": "Forzar una actualización sobrescribirá cualquier edición local."
+		"message": "Forzar una actualización sobrescribirá cualquier edición local.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"toggleStyle": {
-		"message": "Conmutar estilo"
+		"message": "Conmutar estilo",
+		"description": "Label for the checkbox to enable/disable a style"
 	},
 	"importReplaceTooltip": {
-		"message": "Descarta contenidos del estilo actual y los sobrescribe con el estilo importado"
+		"message": "Descarta contenidos del estilo actual y los sobrescribe con el estilo importado",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Doble-clic para maximizar/restaurar la altura",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "Estilos antes que las órdenes"
+		"message": "Estilos antes que las órdenes",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Las secciones le permiten definir distintos fragmentos de código en el mismo estilo para aplicarlos a diferentes conjuntos de URLs. Por ejemplo, un único estilo puede cambiar la página de inicio de un sitio de una forma y modificar el resto del sitio de otra."
+		"message": "Las secciones le permiten definir distintos fragmentos de código en el mismo estilo para aplicarlos a diferentes conjuntos de URLs. Por ejemplo, un único estilo puede cambiar la página de inicio de un sitio de una forma y modificar el resto del sitio de otra.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "No hay estilos instalados para este sitio."
+		"message": "No hay estilos instalados para este sitio.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "y más sitios"
+		"message": "y más sitios",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Eliminar"
+		"message": "Eliminar",
+		"description": "Label for the button to remove an 'applies' entry"
 	},
 	"updatesCurrentlyInstalled": {
-		"message": "Actualizaciones instaladas:"
+		"message": "Actualizaciones instaladas:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Estilo en formato Mozilla"
+		"message": "Estilo en formato Mozilla",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "Escribir estilo para:"
+		"message": "Escribir estilo para:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
 	"replace": {
-		"message": "Reemplazar"
+		"message": "Reemplazar",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
 	},
 	"styleRegexpTestNone": {
-		"message": "No hay pestañas coincidentes"
+		"message": "No hay pestañas coincidentes",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
 	},
 	"importReportLegendUpdatedMeta": {
-		"message": "actualizaron la meta información"
+		"message": "actualizaron la meta información",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Se aplica a"
+		"message": "Se aplica a",
+		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
 	"openOptionsPopup": {
-		"message": "Opciones"
+		"message": "Opciones",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Administrar"
+		"message": "Administrar",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Error de actualización: el servidor ha respondido con el código $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -334,222 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Especificar"
+		"message": "Especificar",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Instalar actualización"
+		"message": "Instalar actualización",
+		"description": "Label for the button to install an update for a single style"
 	},
 	"optionsCheckUpdate": {
-		"message": "Buscar e instalar todas las actualizaciones disponibles"
+		"message": "Buscar e instalar todas las actualizaciones disponibles",
+		"description": ""
 	},
 	"importReportTitle": {
-		"message": "Se completó la importación de estilos"
+		"message": "Se completó la importación de estilos",
+		"description": "Title of the report shown after importing styles"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Formato Mozilla"
+		"message": "Formato Mozilla",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
 	"cm_matchHighlight": {
-		"message": "Resaltar"
+		"message": "Resaltar",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
 	},
 	"styleRegexpPartialExplanation": {
-		"message": "Este estilo utiliza expresiones regulares (regexps) parcialmente coincidentes violando así la <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>especificación @document de CSS4</a> que requiere una coincidencia completa de URL. Las secciones CSS afectadas no se aplicaron a la página. Probablemente este estilo fue creado con Stylish-para-Chrome, que evalúa de modo incorrecto las reglas 'regexp()' desde la primera versión (un fallo conocido)."
+		"message": "Este estilo utiliza expresiones regulares (regexps) parcialmente coincidentes violando así la <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>especificación @document de CSS4</a> que requiere una coincidencia completa de URL. Las secciones CSS afectadas no se aplicaron a la página. Probablemente este estilo fue creado con Stylish-para-Chrome, que evalúa de modo incorrecto las reglas 'regexp()' desde la primera versión (un fallo conocido).",
+		"description": ""
 	},
 	"styleBeautifyIndentConditional": {
-		"message": "Sangrar @media, @supports"
+		"message": "Sangrar @media, @supports",
+		"description": "CSS-beautifier option"
 	},
 	"unreachableContentScript": {
-		"message": "No se pudo comunicar con la página. Pruebe a recargar la pestaña."
+		"message": "No se pudo comunicar con la página. Pruebe a recargar la pestaña.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Eliminar sección"
+		"message": "Eliminar sección",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Desactivar todos los estilos"
+		"message": "Desactivar todos los estilos",
+		"description": "Label for the checkbox that turns all enabled styles off."
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "Este estilo podría haberse editado localmente."
+		"message": "Este estilo podría haberse editado localmente.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
 	},
 	"undoGlobal": {
-		"message": "Deshacer en todas las secciones"
+		"message": "Deshacer en todas las secciones",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Icono de barra de herramientas",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Actualización completada."
+		"message": "Actualización completada.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Buscando..."
+		"message": "Buscando...",
+		"description": "Text to display when checking a style for an update"
 	},
 	"styleRegexpTestFull": {
-		"message": "Pestañas coincidentes"
+		"message": "Pestañas coincidentes",
+		"description": "RegExp test report: label for the fully matching expressions"
 	},
 	"manageMaxTargets": {
-		"message": "Número de elementos se-aplica-a"
+		"message": "Número de elementos se-aplica-a",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
 	},
 	"manageFaviconsHelp": {
-		"message": "Stylus usa un servicio externo https://www.google.com/s2/favicons"
+		"message": "Stylus usa un servicio externo https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"updateCheckSkippedLocallyEdited": {
-		"message": "Este estilo se editó localmente"
+		"message": "Este estilo se editó localmente",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsResetButton": {
-		"message": "Restablecer opciones"
+		"message": "Restablecer opciones",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Código"
+		"message": "Código",
+		"description": "Label for the code for a section"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "Añadir 'Eliminar' al menú contextual del editor"
+		"message": "Añadir 'Eliminar' al menú contextual del editor",
+		"description": ""
 	},
 	"importReportLegendUpdatedBoth": {
-		"message": "actualizarón tanto meta información como código"
+		"message": "actualizarón tanto meta información como código",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "Usar sangría inteligente"
+		"message": "Usar sangría inteligente",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
 	"styleRegexpTestButton": {
-		"message": "Prueba de regexp"
+		"message": "Prueba de regexp",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Utilice los controles 'Se aplica a' para limitar a qué URLs se aplica el código de esta sección."
+		"message": "Utilice los controles 'Se aplica a' para limitar a qué URLs se aplica el código de esta sección.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Editar estilo"
+		"message": "Editar estilo",
+		"description": "Title of the page for editing styles"
 	},
 	"editDeleteText": {
-		"message": "Eliminar"
+		"message": "Eliminar",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocompletar al escribir",
+		"description": "Label for the checkbox in the style editor."
 	},
 	"stylusUnavailableForURLdetails": {
-		"message": "Como medida de precaución, el navegador prohíbe que las extensiones afecten a sus páginas internas (como chrome://version o about:addons) además de las páginas internas de otras extensiones. Cada navegador además restringe el acceso a su propia galería de extensiones (como Chrome Web Store o AMO)."
+		"message": "Como medida de precaución, el navegador prohíbe que las extensiones afecten a sus páginas internas (como chrome://version o about:addons) además de las páginas internas de otras extensiones. Cada navegador además restringe el acceso a su propia galería de extensiones (como Chrome Web Store o AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
 	"cm_matchHighlightSelection": {
-		"message": "Sólo selección"
+		"message": "Sólo selección",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
 	},
 	"updateAllCheckSucceededSomeEdited": {
-		"message": "No se buscaron actualizaciones de algunos estilos actualizables para evitar la pérdida de posibles ediciones locales. Se puede forzar la búsqueda de actualizaciones mediante comprobación individual, o ejecutando otra búsqueda para todos los estilos (las ediciones locales se sobrescribirán)."
+		"message": "No se buscaron actualizaciones de algunos estilos actualizables para evitar la pérdida de posibles ediciones locales. Se puede forzar la búsqueda de actualizaciones mediante comprobación individual, o ejecutando otra búsqueda para todos los estilos (las ediciones locales se sobrescribirán).",
+		"description": "Text that displays when an update all check completed and no updates are available"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus no funciona en páginas como esta."
+		"message": "Stylus no funciona en páginas como esta.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
 	"manageOnlyUpdates": {
-		"message": "Sólo con actualizaciones o problemas"
+		"message": "Sólo con actualizaciones o problemas",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Añadir estilo"
+		"message": "Añadir estilo",
+		"description": "Title of the page for adding styles"
 	},
 	"importReplaceLabel": {
-		"message": "Sobrescribir estilo"
+		"message": "Sobrescribir estilo",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "Ocurrió un error con la base de datos de Stylus. ¿Desea visitar una página web con posibles soluciones?"
+		"message": "Ocurrió un error con la base de datos de Stylus. ¿Desea visitar una página web con posibles soluciones?",
+		"description": "Prompt when a DB error is encountered"
 	},
 	"optionsAdvanced": {
-		"message": "Avanzadas"
+		"message": "Avanzadas",
+		"description": ""
 	},
 	"importAppendTooltip": {
-		"message": "Agrega el estilo importado al estilo actual"
+		"message": "Agrega el estilo importado al estilo actual",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
 	},
 	"editorStylesButton": {
-		"message": "Buscar estilos del editor"
+		"message": "Buscar estilos del editor",
+		"description": "Find styles for the editor"
 	},
 	"optionsOpen": {
-		"message": "Abrir"
+		"message": "Abrir",
+		"description": ""
 	},
 	"helpKeyMapHotkey": {
-		"message": "Pulse un atajo"
+		"message": "Pulse un atajo",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "Expresiones regulares no válidas omitidas"
+		"message": "Expresiones regulares no válidas omitidas",
+		"description": "RegExp test report: label for the invalid expressions"
 	},
 	"replaceAll": {
-		"message": "Reemplazar todo"
+		"message": "Reemplazar todo",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
 	},
 	"importReportUnchanged": {
-		"message": "No se cambió nada."
+		"message": "No se cambió nada.",
+		"description": "Message in the report shown after importing styles"
 	},
 	"optionsActions": {
-		"message": "Acciones"
+		"message": "Acciones",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "Ir a la línea (o a línea:col)"
+		"message": "Ir a la línea (o a línea:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
 	},
 	"manageOnlyLocalTooltip": {
-		"message": "(los estilos no instalados mediante una página de userstyles.org)"
+		"message": "(los estilos no instalados mediante una página de userstyles.org)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Buscar actualizaciones para todos los estilos"
+		"message": "Buscar actualizaciones para todos los estilos",
+		"description": "Label for the button to check all styles for updates"
 	},
 	"openOptionsManage": {
-		"message": "Interfaz de opciones"
+		"message": "Interfaz de opciones",
+		"description": "Go to Options UI"
 	},
 	"issuesHelp": {
-		"message": "Problemas encontrados por <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> con estas reglas aplicadas:"
+		"message": "Problemas encontrados por <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> con estas reglas aplicadas:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
 	},
 	"optionsCustomizeBadge": {
-		"message": "Distintivo en el icono de barra de herramientas"
+		"message": "Distintivo en el icono de barra de herramientas",
+		"description": ""
 	},
 	"importReportLegendIdentical": {
-		"message": "idénticos omitidos"
+		"message": "idénticos omitidos",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
 	},
 	"optionsPopupWidth": {
-		"message": "Anchura del diálogo emergente (en píxeles)"
+		"message": "Anchura del diálogo emergente (en píxeles)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
 	},
 	"undo": {
-		"message": "Deshacer"
+		"message": "Deshacer",
+		"description": "Button label"
 	},
 	"cm_keyMap": {
-		"message": "Mapa de teclado"
+		"message": "Mapa de teclado",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
 	},
 	"manageNewUI": {
-		"message": "Nuevo diseño de interfaz de gestión"
+		"message": "Nuevo diseño de interfaz de gestión",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
 	},
 	"importReportUndoneTitle": {
-		"message": "La importación ha sido revertida"
+		"message": "La importación ha sido revertida",
+		"description": "Title of the message box shown after undoing the import of styles"
 	},
 	"genericDisabledLabel": {
-		"message": "Desactivado"
+		"message": "Desactivado",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "Usar pestañas con sangría inteligente"
+		"message": "Usar pestañas con sangría inteligente",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
 	"replaceWith": {
-		"message": "Reemplazar con"
+		"message": "Reemplazar con",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Eliminar"
+		"message": "Eliminar",
+		"description": "Label for the button to delete a style"
 	},
 	"updateCheckManualUpdateForce": {
-		"message": "Instalar actualización (se sobrescribirán las ediciones locales)"
+		"message": "Instalar actualización (se sobrescribirán las ediciones locales)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsAdvancedExposeIframes": {
-		"message": "Exponer marcos integrados (iframes) vía HTML[stylus-iframe]"
+		"message": "Exponer marcos integrados (iframes) vía HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Escribir un nuevo estilo"
+		"message": "Escribir un nuevo estilo",
+		"description": "Label for the button to go to the add style page"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "Para desactivar las búsquedas automáticas de actualizaciones, establezca el intervalo a 0"
+		"message": "Para desactivar las búsquedas automáticas de actualizaciones, establezca el intervalo a 0",
+		"description": ""
 	},
 	"backupButtons": {
-		"message": "Copia de seguridad"
+		"message": "Copia de seguridad",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "Sólo estilos activos"
+		"message": "Sólo estilos activos",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Editar"
+		"message": "Editar",
+		"description": "Label for the button to go to the edit style page"
 	},
 	"cm_theme": {
-		"message": "Temas"
+		"message": "Temas",
+		"description": "Label for the style editor's CSS theme."
 	},
 	"backupMessage": {
-		"message": "Seleccione un fichero o arrástrelo y suéltelo en esta página."
+		"message": "Seleccione un fichero o arrástrelo y suéltelo en esta página.",
+		"description": "Message for backup"
 	},
 	"importReportUndone": {
-		"message": "estilos fueron revertidos"
+		"message": "estilos fueron revertidos",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "Nombre del comando"
+		"message": "Nombre del comando",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Rediseñe la web con Stylus, un administrador de estilos de usuario. Stylus le permite instalar fácilmente temas y coberturas para muchos sitios populares."
+		"message": "Rediseñe la web con Stylus, un administrador de estilos de usuario. Stylus le permite instalar fácilmente temas y coberturas para muchos sitios populares.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index 028a3587..b953494f 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -1,91 +1,354 @@
 {
 	"appliesToEverything": {
-		"message": "Kaikki"
+		"message": "Kaikki",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "default",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Export",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
+	},
+	"cm_tabSize": {
+		"message": "Tab size",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Aktivoi"
+		"message": "Aktivoi",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Syötä nimi."
+		"message": "Syötä nimi.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URL ositteita domainilla"
+		"message": "URL ositteita domainilla",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Hae päivityksiä"
+		"message": "Hae päivityksiä",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date."
+		"message": "All styles are up to date.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Apu"
+		"message": "Apu",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Yes",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Hae lisää tyylejä tälle sivustolle"
+		"message": "Hae lisää tyylejä tälle sivustolle",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Asennetut Tyylit"
+		"message": "Asennetut Tyylit",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Aktivoitu"
+		"message": "Aktivoitu",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla formaattia koodista voidaan käyttää Stylish Firefoxille ohjelmassa ja voidaan lähettää userstyles.orgiin."
+		"message": "Mozilla formaattia koodista voidaan käyttää Stylish Firefoxille ohjelmassa ja voidaan lähettää userstyles.orgiin.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Lisää uusi osio"
+		"message": "Lisää uusi osio",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Tallenna"
+		"message": "Tallenna",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
+	},
+	"writeStyleForURL": {
+		"message": "this URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Lisää"
+		"message": "Lisää",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URL ositteet jotka vastaavat regexpiä"
+		"message": "URL ositteet jotka vastaavat regexpiä",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "Asennetaanko '$stylename$' Stylusiin?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "Poista Käytöstä"
+		"message": "Poista Käytöstä",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button"
+		"message": "Show number of styles active for the current site on the toolbar button",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "Show active style count",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+	},
+	"cm_lineWrapping": {
+		"message": "Word wrap",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Takaisin hallintapaneeliin"
+		"message": "Takaisin hallintapaneeliin",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Olet tehnyt muutoksia tähän tyyliin tallentamatta."
+		"message": "Olet tehnyt muutoksia tähän tyyliin tallentamatta.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Päivitys epäonnistui: ei voitu yhdistää palvelimeen."
+		"message": "Päivitys epäonnistui: ei voitu yhdistää palvelimeen.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "Filters",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "Apply all updates",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Oletko varma että haluat poistaa tämän tyylin?"
+		"message": "Oletko varma että haluat poistaa tämän tyylin?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Regexp ei kelpaa."
+		"message": "Regexp ei kelpaa.",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "Options",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Kooskee: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
+	"styleUpdate": {
+		"message": "Are you sure you want to update '$stylename$'?",
+		"description": "Confirmation when updating a style",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
 	"styleSectionsTitle": {
-		"message": "Osiot"
+		"message": "Osiot",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Muokkaa Tyyliä $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -93,37 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Tyyli on ajan tasalla."
+		"message": "Tyyli on ajan tasalla.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL osoitteet jotka alkavat"
+		"message": "URL osoitteet jotka alkavat",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu"
+		"message": "List styles before commands in the toolbar button menu",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Osiot antavat sinun tarkentaa koodin eri osia niin että ne koskevat eri URL osoitteita samassa tyylissä. Esimerkiksi, yksi tyyli voi muokata kotisivua yhdellä tavalla kun se muokkaa koko muuta sivustoa toisella tavalla."
+		"message": "Osiot antavat sinun tarkentaa koodin eri osia niin että ne koskevat eri URL osoitteita samassa tyylissä. Esimerkiksi, yksi tyyli voi muokata kotisivua yhdellä tavalla kun se muokkaa koko muuta sivustoa toisella tavalla.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Ei asennettuja tyylejä tällä sivustolla."
+		"message": "Ei asennettuja tyylejä tällä sivustolla.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "ja lisää"
+		"message": "ja lisää",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Poista"
+		"message": "Poista",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
 	"manageTitle": {
-		"message": "Tyylikäs"
+		"message": "Tyylikäs",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "Write style for: ",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Koskee"
+		"message": "Koskee",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Hallitse asennettuja tyylejä"
+		"message": "Hallitse asennettuja tyylejä",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Päivitys epäonnistui: palvelin vastasi koodilla $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -131,45 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Tarkenna"
+		"message": "Tarkenna",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Asenna päivitys"
+		"message": "Asenna päivitys",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Poista osio"
+		"message": "Poista osio",
+		"description": "Label for the button to remove a section"
+	},
+	"disableAllStyles": {
+		"message": "Turn all styles off",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Päivitys suoritettu."
+		"message": "Päivitys suoritettu.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Tarkistetaan..."
+		"message": "Tarkistetaan...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Koodi"
+		"message": "Koodi",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "Use smart indentation",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Käytä 'Koskee' kontrolleja rajoittaaksesi mitä URL osoitteisiin tämä osio koodista koskee."
+		"message": "Käytä 'Koskee' kontrolleja rajoittaaksesi mitä URL osoitteisiin tämä osio koodista koskee.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Muokkaa Tyyliä"
+		"message": "Muokkaa Tyyliä",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus doesn't work on pages like this.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Lisää Tyyli"
+		"message": "Lisää Tyyli",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"dbError": {
+		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "Goto line (or line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Tarkista kaikki tyylit päivityksien varalta"
+		"message": "Tarkista kaikki tyylit päivityksien varalta",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Keymap",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "Use tabs with smart indentation",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Poista"
+		"message": "Poista",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Uusi Tyyli"
+		"message": "Uusi Tyyli",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "Only enabled styles",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Muokkaa"
+		"message": "Muokkaa",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Type a command name",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Uudelleen stailaa netti Stylusillä, käyttäjän tyyli hallintapaneelilla. Stylus antaa sinun helposti asentaa teemoja ja skinejä palvelluille kuten Google, Facebook, YouTube, Orkut, ja monelle, monelle muulle sivustolle."
+		"message": "Uudelleen stailaa netti Stylusillä, käyttäjän tyyli hallintapaneelilla. Stylus antaa sinun helposti asentaa teemoja ja skinejä palvelluille kuten Google, Facebook, YouTube, Orkut, ja monelle, monelle muulle sivustolle.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 316eb890..604a1214 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -1,117 +1,354 @@
 {
 	"appliesToEverything": {
-		"message": "Tout"
+		"message": "Tout",
+		"description": "Text displayed for styles that apply to all sites"
 	},
 	"defaultTheme": {
-		"message": "défaut"
+		"message": "défaut",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
 	},
 	"exportLabel": {
-		"message": "Exportez"
+		"message": "Exportez",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Taille des tabulations"
+		"message": "Taille des tabulations",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Activer"
+		"message": "Activer",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Veuillez saisir un nom."
+		"message": "Veuillez saisir un nom.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URL sur le domaine"
+		"message": "URL sur le domaine",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Rechercher des mises à jour"
+		"message": "Rechercher des mises à jour",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "All styles are up to date."
+		"message": "All styles are up to date.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Aide"
+		"message": "Aide",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
 	},
 	"confirmYes": {
-		"message": "Oui"
+		"message": "Oui",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Rechercher d'autres styles pour ce site"
+		"message": "Rechercher d'autres styles pour ce site",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Styles installés"
+		"message": "Styles installés",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Activé"
+		"message": "Activé",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Le code au format Mozilla peut être utilisé dans Stylish for Firefox et envoyé à userstyles.org."
+		"message": "Le code au format Mozilla peut être utilisé dans Stylish for Firefox et envoyé à userstyles.org.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Ajouter une section"
+		"message": "Ajouter une section",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Enregistrer"
+		"message": "Enregistrer",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "cette URL"
+		"message": "cette URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Ajouter"
+		"message": "Ajouter",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URL correspondant à l'expression régulière"
+		"message": "URL correspondant à l'expression régulière",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "Installer \"$stylename$\" dans Stylus ?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "Désactiver"
+		"message": "Désactiver",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Afficher le nombre de styles actifs pour le site actuel sur le boutton Stylus"
+		"message": "Afficher le nombre de styles actifs pour le site actuel sur le boutton Stylus",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "Show active style count",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "Retour à la ligne automatique"
+		"message": "Retour à la ligne automatique",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Retour à la gestion"
+		"message": "Retour à la gestion",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Vous avez apporté des modifications à ce style sans les enregistrer."
+		"message": "Vous avez apporté des modifications à ce style sans les enregistrer.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Échec de la mise à jour: le serveur est inaccessible."
+		"message": "Échec de la mise à jour: le serveur est inaccessible.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "Filtres"
+		"message": "Filtres",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "Apply all updates",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Voulez-vous vraiment supprimer ce style ?"
+		"message": "Voulez-vous vraiment supprimer ce style ?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Le Regexp est éronné"
+		"message": "Le Regexp est éronné",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "Options",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "S'applique à : $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
 	"styleUpdate": {
 		"message": "Voulez-vous mettre à jour '$stylename$'?",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"styleSectionsTitle": {
+		"message": "Sections",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
+	},
 	"editStyleTitle": {
 		"message": "Modifier le style $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -119,34 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Le style est à jour."
+		"message": "Le style est à jour.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL commençant par"
+		"message": "URL commençant par",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "List styles before commands in the toolbar button menu"
+		"message": "List styles before commands in the toolbar button menu",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Les sections vous permettent de définir différentes portions de code correspondant à un même style que vous pouvez appliquer à des ensembles d'URL distincts. Par exemple, un même style appliqué à la page d'accueil peut modifier celle-ci d'une certaine manière et modifier le reste du site Web d'une autre manière."
+		"message": "Les sections vous permettent de définir différentes portions de code correspondant à un même style que vous pouvez appliquer à des ensembles d'URL distincts. Par exemple, un même style appliqué à la page d'accueil peut modifier celle-ci d'une certaine manière et modifier le reste du site Web d'une autre manière.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Aucun style n'est installé pour ce site."
+		"message": "Aucun style n'est installé pour ce site.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "et bien plus encore"
+		"message": "et bien plus encore",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Supprimer"
+		"message": "Supprimer",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "Write style for: ",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "S'applique à"
+		"message": "S'applique à",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Gérer les styles installés"
+		"message": "Gérer les styles installés",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Échec de la mise à jour: le serveur a renvoyé le code $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -154,57 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Préciser"
+		"message": "Préciser",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Installer la mise à jour"
+		"message": "Installer la mise à jour",
+		"description": "Label for the button to install an update for a single style"
 	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus ne fonctionne pas sur les pages de ce genre"
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Supprimer la section"
+		"message": "Supprimer la section",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Désactiver tous les styles"
+		"message": "Désactiver tous les styles",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Mise à jour terminée."
+		"message": "Mise à jour terminée.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Vérification en cours…"
+		"message": "Vérification en cours…",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
+	},
+	"sectionCode": {
+		"message": "Code",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "Use smart indentation",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Utilisez l'option \"S'applique à\" pour préciser les URL auxquelles le code de cette section s'applique."
+		"message": "Utilisez l'option \"S'applique à\" pour préciser les URL auxquelles le code de cette section s'applique.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Modifier le style"
+		"message": "Modifier le style",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus ne fonctionne pas sur les pages de ce genre",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Ajouter un style"
+		"message": "Ajouter un style",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "Une erreur s'est produite dans la base de donnée de Stylus. Voulez-vous visiter une page web avec les solutions possibles ?"
+		"message": "Une erreur s'est produite dans la base de donnée de Stylus. Voulez-vous visiter une page web avec les solutions possibles ?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "Goto line (or line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Rechercher des mises à jour pour tous les styles"
+		"message": "Rechercher des mises à jour pour tous les styles",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
 	},
 	"confirmNo": {
-		"message": "Non"
+		"message": "Non",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Keymap",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "Use tabs with smart indentation",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Supprimer"
+		"message": "Supprimer",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Créer un nouveau style"
+		"message": "Créer un nouveau style",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "Only enabled styles",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Modifier"
+		"message": "Modifier",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "Tapez un nom de commande"
+		"message": "Tapez un nom de commande",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Changez l'apparence du Web grâce à Stylus, un outil de gestion des styles utilisateur. Stylus vous permet d'installer facilement des thèmes et des habillages pour Google, Facebook, YouTube, orkut et bien d'autres sites encore."
+		"message": "Changez l'apparence du Web grâce à Stylus, un outil de gestion des styles utilisateur. Stylus vous permet d'installer facilement des thèmes et des habillages pour Google, Facebook, YouTube, orkut et bien d'autres sites encore.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 808c08c6..c7169210 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -1,82 +1,354 @@
 {
 	"appliesToEverything": {
-		"message": "Tutto"
+		"message": "Tutto",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "default",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Export",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
+	},
+	"cm_tabSize": {
+		"message": "Tab size",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Attiva"
+		"message": "Attiva",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Inserisci un nome."
+		"message": "Inserisci un nome.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URL nel dominio"
+		"message": "URL nel dominio",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Verifica la presenza di aggiornamenti"
+		"message": "Verifica la presenza di aggiornamenti",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
+	},
+	"updateAllCheckSucceededNoUpdate": {
+		"message": "No updates found.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Guida"
+		"message": "Guida",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Yes",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Trova più stili per questo sito"
+		"message": "Trova più stili per questo sito",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Stili installati"
+		"message": "Stili installati",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Attivato"
+		"message": "Attivato",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Il formato Mozilla del codice può essere utilizzato con Stylish per Firefox e può essere inviato a userstyles.org."
+		"message": "Il formato Mozilla del codice può essere utilizzato con Stylish per Firefox e può essere inviato a userstyles.org.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Aggiungi un'altra sezione"
+		"message": "Aggiungi un'altra sezione",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Salva"
+		"message": "Salva",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
+	},
+	"writeStyleForURL": {
+		"message": "this URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Aggiungi"
+		"message": "Aggiungi",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URL corrispondenti all'espressione regolare"
+		"message": "URL corrispondenti all'espressione regolare",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "Installare \"$stylename$\" in Stylus?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "Disattiva"
+		"message": "Disattiva",
+		"description": "Label for the button to disable a style"
+	},
+	"prefShowBadge": {
+		"message": "Number of styles active for the current site",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "Show active style count",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+	},
+	"cm_lineWrapping": {
+		"message": "Word wrap",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Torna a gestione"
+		"message": "Torna a gestione",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Hai apportato modifiche a questo stile senza salvare."
+		"message": "Hai apportato modifiche a questo stile senza salvare.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Aggiornamento non riuscito: server non raggiungibile."
+		"message": "Aggiornamento non riuscito: server non raggiungibile.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "Filters",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "Apply all updates",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Vuoi eliminare questo stile?"
+		"message": "Vuoi eliminare questo stile?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
+	},
+	"styleBadRegexp": {
+		"message": "Regexp is invalid.",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "Options",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Applica a: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
+	"styleUpdate": {
+		"message": "Are you sure you want to update '$stylename$'?",
+		"description": "Confirmation when updating a style",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
 	"styleSectionsTitle": {
-		"message": "Sezioni"
+		"message": "Sezioni",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Modifica dello stile $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -84,31 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Lo stile è aggiornato."
+		"message": "Lo stile è aggiornato.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL che iniziano con"
+		"message": "URL che iniziano con",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
+	},
+	"popupStylesFirst": {
+		"message": "Styles before commands",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Le sezioni consentono di definire diverse parti di codice da applicare a diversi insiemi di URL dello stesso stile. Ad esempio, un unico stile potrebbe modificare la home page di un sito diversamente da come modificherebbe il resto del sito."
+		"message": "Le sezioni consentono di definire diverse parti di codice da applicare a diversi insiemi di URL dello stesso stile. Ad esempio, un unico stile potrebbe modificare la home page di un sito diversamente da come modificherebbe il resto del sito.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Nessuno stile installato per questo sito."
+		"message": "Nessuno stile installato per questo sito.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "e altro ancora"
+		"message": "e altro ancora",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Rimuovi"
+		"message": "Rimuovi",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "Write style for: ",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Vale per"
+		"message": "Vale per",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Gestisci gli stili installati"
+		"message": "Gestisci gli stili installati",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Aggiornamento non riuscito: il server ha risposto con il codice $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -116,45 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specifica"
+		"message": "Specifica",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Installa aggiornamento"
+		"message": "Installa aggiornamento",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Rimuovi sezione"
+		"message": "Rimuovi sezione",
+		"description": "Label for the button to remove a section"
+	},
+	"disableAllStyles": {
+		"message": "Turn all styles off",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Aggiornamento completato."
+		"message": "Aggiornamento completato.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Verifica in corso..."
+		"message": "Verifica in corso...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Codice"
+		"message": "Codice",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "Use smart indentation",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Utilizza i controlli \"Applica a\" per limitare gli URL a cui viene applicato il codice in questa sezione."
+		"message": "Utilizza i controlli \"Applica a\" per limitare gli URL a cui viene applicato il codice in questa sezione.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Modifica di stili"
+		"message": "Modifica di stili",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus doesn't work on pages like this.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Aggiunta di stili"
+		"message": "Aggiunta di stili",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"dbError": {
+		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "Goto line (or line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Verifica la disponibilità di aggiornamenti per tutti gli stili"
+		"message": "Verifica la disponibilità di aggiornamenti per tutti gli stili",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Keymap",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "Use tabs with smart indentation",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Elimina"
+		"message": "Elimina",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Scrivi nuovo stile"
+		"message": "Scrivi nuovo stile",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "Only enabled styles",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Modifica"
+		"message": "Modifica",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Type a command name",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Modifica lo stile del Web con Stylus, un gestore di stili utente. Stylus consente di installare facilmente temi e skin per Google, Facebook, YouTube, Orkut e moltissimi altri siti."
+		"message": "Modifica lo stile del Web con Stylus, un gestore di stili utente. Stylus consente di installare facilmente temi e skin per Google, Facebook, YouTube, Orkut e moltissimi altri siti.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index 11baaffe..168fcec7 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -1,85 +1,354 @@
 {
 	"appliesToEverything": {
-		"message": "すべて"
+		"message": "すべて",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "デフォルト",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "一致する開いているタブのリスト（URLをクリックしてタブにフォーカスします）",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "スタイルをエクスポート",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "利用可能なすべてのユーザースタイルの更新を自動的にチェックしてインストールします（時間単位）",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Alt-Enterを押して、有効/無効の状態を切り替え、スタイルを保存します",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "エクスポート",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "背景色",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "更新チェックの履歴",
+		"description": ""
+	},
+	"cm_tabSize": {
+		"message": "タブサイズ",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "有効化"
+		"message": "有効化",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "名前を入力してください。"
+		"message": "名前を入力してください。",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "履歴",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "キーボードショートカットを定義する",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "ドメイン上の URL"
+		"message": "ドメイン上の URL",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "アップデートをチェック"
+		"message": "アップデートをチェック",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "スタイルに追加",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "スタイルを管理",
+		"description": ""
+	},
+	"updateAllCheckSucceededNoUpdate": {
+		"message": "更新は見つかりませんでした。",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Mozilla形式のコードを貼り付ける",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "このページの任意の場所にバックアップファイルをドロップしてインポートします。",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "ヘルプ"
+		"message": "ヘルプ",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "検索",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "グレーアウト",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "はい",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "このサイト用の他のスタイルを検索"
+		"message": "このサイト用の他のスタイルを検索",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "インストール済みのスタイル"
+		"message": "インストール済みのスタイル",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "有効"
+		"message": "有効",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla 形式のコードは、Stylish for Firefox で使用することができ、userstyles.org に投稿することができます。"
+		"message": "Mozilla 形式のコードは、Stylish for Firefox で使用することができ、userstyles.org に投稿することができます。",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "他のセクションを追加"
+		"message": "他のセクションを追加",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "保存"
+		"message": "保存",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "削除",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "キャンセル",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "スタイルをインポート",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "中止",
+		"description": "'Stop' button in a confirm dialog"
+	},
+	"writeStyleForURL": {
+		"message": "this URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "その他のオプション",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "追加"
+		"message": "追加",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "正規表現に一致する URL"
+		"message": "正規表現に一致する URL",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "コードを更新",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "「$stylename$」を Stylus にインストールしますか？",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "無効にしたときの背景色",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "スタイルを更新",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>userstyles.orgでスタイルを取得</a> | <a href='http://add0n.com/stylus.html'>ヘルプ</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "ローカルに作成されたスタイルのみ",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "コンテンツの検索",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "旧バージョンまたはStylishからスタイルバックアップをインポートする場合は、スタイルマネージャで手動で更新を一度チェックして、すべてのスタイルが確実に更新されるようにします。",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylusはchrome://extensionsページのStylus拡張機能に対応するチェックボックスを有効にした場合にのみ、file:// URLにアクセスできます。",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "無効化"
+		"message": "無効化",
+		"description": "Label for the button to disable a style"
+	},
+	"prefShowBadge": {
+		"message": "現在のサイトでアクティブなスタイルの数を表示",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "適用先欄のファビコン",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "アクティブなスタイルの数を表示する",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+	},
+	"cm_lineWrapping": {
+		"message": "ワードラップ",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "管理画面に戻る"
+		"message": "管理画面に戻る",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "このスタイルは変更されていますが、保存されていません。"
+		"message": "このスタイルは変更されていますが、保存されていません。",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "インポート",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "ショートカット",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新に失敗しました: サーバーに到達できません。"
+		"message": "更新に失敗しました: サーバーに到達できません。",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "フィルター",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "すべての更新を適用",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "オプションをデフォルト値にリセットする",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "アップデート",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "このスタイルを削除してもよろしいですか？"
+		"message": "このスタイルを削除してもよろしいですか？",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "ポップアップ",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "正規表現は無効です。"
+		"message": "正規表現は無効です。",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "オプション",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "適用先: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "スタイルマネージャーを開く",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
+	"styleUpdate": {
+		"message": "「$stylename$」を更新してもよろしいですか？",
+		"description": "Confirmation when updating a style",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
 	"styleSectionsTitle": {
-		"message": "セクション"
+		"message": "セクション",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "スタイル「$stylename$」を編集",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -87,31 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "スタイルは最新の状態です。"
+		"message": "スタイルは最新の状態です。",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "次で始まる URL"
+		"message": "次で始まる URL",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "カーソル下の単語",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "正規表現検索に /re/ シンタックスを使用する",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "更新を強制すると、すべてのローカル編集が上書きされます。",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "スタイルを切り替え",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "現在のスタイルの内容を破棄し、インポートされたスタイルで上書きする",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
+	},
+	"popupStylesFirst": {
+		"message": "スタイルをコマンドボタンの前に",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "セクションを利用すると、1 つのスタイルの中で複数のコードを定義し、それぞれ異なる URL に適用することができます。たとえば、単一のスタイルで、サイトのトップページの表示方法と他のページの表示方法を変えることができます。"
+		"message": "セクションを利用すると、1 つのスタイルの中で複数のコードを定義し、それぞれ異なる URL に適用することができます。たとえば、単一のスタイルで、サイトのトップページの表示方法と他のページの表示方法を変えることができます。",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "このサイト用のスタイルはインストールされていません。"
+		"message": "このサイト用のスタイルはインストールされていません。",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "サイトを追加"
+		"message": "サイトを追加",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "削除"
+		"message": "削除",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Mozilla形式のスタイル",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "次のスタイルを書く:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "置換",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "適用先"
+		"message": "適用先",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "オプション",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "インストール済みのスタイルを管理"
+		"message": "インストール済みのスタイルを管理",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "更新に失敗しました: サーバーが応答コード「$code$」を返しています。",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -119,45 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "個別指定"
+		"message": "個別指定",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "アップデートをインストール"
+		"message": "アップデートをインストール",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "使用可能なすべての更新を確認してインストールする",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "スタイルのインポートが終了しました",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "ハイライト",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "ページと通信できませんでした。タブを再読み込みしてみてください。",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "セクションを削除"
+		"message": "セクションを削除",
+		"description": "Label for the button to remove a section"
+	},
+	"disableAllStyles": {
+		"message": "すべてのスタイルをオフにする",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "このスタイルはローカルで編集されている可能性があります。",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "すべてのセクションで元に戻す",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "更新が完了しました"
+		"message": "更新が完了しました",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "チェック中..."
+		"message": "チェック中...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "適用先アイテムの数",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylusは外部サービスを使用します https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "このスタイルはローカルで編集されました。",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "オプションをリセット",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "コード"
+		"message": "コード",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "エディタのコンテキストメニューに「削除」を追加",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "スマートインデントを使用する",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "[適用先] を使用すると、このセクションのコードが適用される URL を制限することができます。"
+		"message": "[適用先] を使用すると、このセクションのコードが適用される URL を制限することができます。",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "スタイルを編集"
+		"message": "スタイルを編集",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "削除",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "セキュリティ上の予防措置として、ブラウザは拡張機能が他の拡張機能のページと同様に、内蔵のページ（chrome://versionやabout:addonsなど）に影響を及ぼさないようにします。各ブラウザは、独自の拡張機能ギャラリー（ChromeウェブストアやAMOなど）へのアクセスも制限しています。",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "選択した単語のみ",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "可能なローカル編集を失うのを避けるために、更新可能なスタイルがチェックされていませんでした。更新を強制的に行うには、個別にチェックするか、すべてのスタイルに対して別のチェックを実行します（ローカル編集は上書きされます）。",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "このようなページではStylusは動作しません。",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "更新または問題の場合のみ",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "スタイルを追加"
+		"message": "スタイルを追加",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "スタイルを上書き",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"dbError": {
+		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "上級者向け",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "インポートされたスタイルを現在のスタイルに追加する",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "エディタスタイルを見つける",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "開く",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "ホットキーを押す",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "すべて置換",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "行（または行:列）に移動",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "（userstyles.orgページからインストールされていないスタイル）",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "すべてのスタイルのアップデートをチェック"
+		"message": "すべてのスタイルのアップデートをチェック",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "オプション UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "これらのルールを有効にして <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> で見つかった問題:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "ツールバーアイコンのバッジ",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "ポップアップの幅 (ピクセル単位)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "いいえ",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "元に戻す",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "キーマップ",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "新しい管理UIレイアウト",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "インポートが取り消されました",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "無効化",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "スマートインデント付きのタブを使用する",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "次に置換",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "削除"
+		"message": "削除",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "新しいスタイルを作成"
+		"message": "新しいスタイルを作成",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "ユーザースタイルの自動更新チェックを無効にするには、間隔を0に設定します。",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "バックアップ",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "有効なスタイルのみ",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "編集"
+		"message": "編集",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "テーマ",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "ファイルを選択するか、このページにドラッグ＆ドロップします。",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "コマンド名を入力",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Stylus はユーザー スタイルを管理するツールで、ウェブのスタイルを変更することができます。Stylus を利用すると、Google、Facebook、YouTube、orkut など、さまざまなサイトに対応したテーマやスキンを簡単にインストールできます。"
+		"message": "Stylus はユーザー スタイルを管理するツールで、ウェブのスタイルを変更することができます。Stylus を利用すると、Google、Facebook、YouTube、orkut など、さまざまなサイトに対応したテーマやスキンを簡単にインストールできます。",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index e606a10c..48795942 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -1,142 +1,337 @@
 {
 	"appliesToEverything": {
-		"message": "Alles"
+		"message": "Alles",
+		"description": "Text displayed for styles that apply to all sites"
 	},
 	"defaultTheme": {
-		"message": "standaard"
+		"message": "standaard",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
 	},
 	"exportLabel": {
-		"message": "Exporteren"
+		"message": "Exporteren",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
 	"issues": {
-		"message": "Problemen"
+		"message": "Problemen",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Tabgrootte"
+		"message": "Tabgrootte",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Inschakelen"
+		"message": "Inschakelen",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Vul een naam in."
+		"message": "Vul een naam in.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URL's op het domein"
+		"message": "URL's op het domein",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Controleren op update"
+		"message": "Controleren op update",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
 	},
 	"importAppendLabel": {
-		"message": "Toevoegen aan stijl"
+		"message": "Toevoegen aan stijl",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Alle stijlen zijn bijgewerkt."
+		"message": "Alle stijlen zijn bijgewerkt.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Plak de Mozilla-opmaakcode"
+		"message": "Plak de Mozilla-opmaakcode",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Hul"
+		"message": "Hul",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
 	},
 	"search": {
-		"message": "Zoeken"
+		"message": "Zoeken",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
 	},
 	"confirmYes": {
-		"message": "Ja"
+		"message": "Ja",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Meer stijlen zoeken voor deze website"
+		"message": "Meer stijlen zoeken voor deze website",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Geïnstalleerde stijlen"
+		"message": "Geïnstalleerde stijlen",
+		"description": "Heading for the manage page"
 	},
 	"styleBeautify": {
-		"message": "Mooier maken"
+		"message": "Mooier maken",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Ingeschakeld"
+		"message": "Ingeschakeld",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "De Mozilla-opmaak van de code kan worden gebruikt met Stylish voor Firefox en worden ingezonden naar userstyles.org."
+		"message": "De Mozilla-opmaak van de code kan worden gebruikt met Stylish voor Firefox en worden ingezonden naar userstyles.org.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Nog een sectie toevoegen"
+		"message": "Nog een sectie toevoegen",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Opslaan"
+		"message": "Opslaan",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
 	},
 	"confirmStop": {
-		"message": "Stoppen"
+		"message": "Stoppen",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "deze URL"
+		"message": "deze URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Toevoegen"
+		"message": "Toevoegen",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URL's overeenkomend met de regexp"
+		"message": "URL's overeenkomend met de regexp",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "'$stylename$' installeren in Stylus?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Verkrijg stijlen op userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Verkrijg hulp</a>"
+		"message": "<a href='https://userstyles.org'>Verkrijg stijlen op userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Verkrijg hulp</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"searchStyles": {
-		"message": "Inhoud doorzoeken"
+		"message": "Inhoud doorzoeken",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
 	},
 	"disableStyleLabel": {
-		"message": "Uitschakelen"
+		"message": "Uitschakelen",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Aantal actieve stijlen voor de huidige website weergeven op de werkbalkknop"
+		"message": "Aantal actieve stijlen voor de huidige website weergeven op de werkbalkknop",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "Teller voor actieve stijlen weergeven"
+		"message": "Teller voor actieve stijlen weergeven",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "Woordomslag"
+		"message": "Woordomslag",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Terug naar beheren"
+		"message": "Terug naar beheren",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "U heeft wijzigingen aangebracht in deze stijl zonder deze op te slaan."
+		"message": "U heeft wijzigingen aangebracht in deze stijl zonder deze op te slaan.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
 	"importLabel": {
-		"message": "Importeren"
+		"message": "Importeren",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Update mislukt: server onbereikbaar."
+		"message": "Update mislukt: server onbereikbaar.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "Filters",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "Alle bijwerkingen toepassen"
+		"message": "Alle bijwerkingen toepassen",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Weet u zeker dat u deze stijl wilt verwijderen?"
+		"message": "Weet u zeker dat u deze stijl wilt verwijderen?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Regexp is ongeldig."
+		"message": "Regexp is ongeldig.",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "Voorkeuren"
+		"message": "Voorkeuren",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Toepasbaar op: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
 	"styleUpdate": {
 		"message": "Weet u zeker dat u '$stylename$' wilt updaten?",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -144,10 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Secties"
+		"message": "Secties",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Stijl $stylename$ bewerken",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -155,49 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Stijl is up-to-date."
+		"message": "Stijl is up-to-date.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL's beginnend met"
+		"message": "URL's beginnend met",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
 	},
 	"searchRegexp": {
-		"message": "Gebruik /re/-syntax voor regexp-zoeken"
+		"message": "Gebruik /re/-syntax voor regexp-zoeken",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
 	},
 	"importReplaceTooltip": {
-		"message": "Verwerp de inhoud van de huidige stijl en overschrijf het met de geïmporteerde stijl"
+		"message": "Verwerp de inhoud van de huidige stijl en overschrijf het met de geïmporteerde stijl",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "Stijlen vóór commando's opsomming in het werkbalkknopmenu"
+		"message": "Stijlen vóór commando's opsomming in het werkbalkknopmenu",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Secties stellen u in staat om andere stukken code toe te passen op andere URL's in dezelfde stijl. Bijv.: een enkele stijl kan de homepage van een site aanpassen op een bepaalde manier, terwijl de rest van de site op een andere manier wordt aangepast."
+		"message": "Secties stellen u in staat om andere stukken code toe te passen op andere URL's in dezelfde stijl. Bijv.: een enkele stijl kan de homepage van een site aanpassen op een bepaalde manier, terwijl de rest van de site op een andere manier wordt aangepast.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Geen geïnstalleerde stijlen voor deze website."
+		"message": "Geen geïnstalleerde stijlen voor deze website.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "en meer"
+		"message": "en meer",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Verwijderen"
+		"message": "Verwijderen",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Stijl in Mozilla-opmaak"
+		"message": "Stijl in Mozilla-opmaak",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "Stijl schrijven voor:"
+		"message": "Stijl schrijven voor:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
 	"replace": {
-		"message": "Vervangen"
+		"message": "Vervangen",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Toepasbaar op"
+		"message": "Toepasbaar op",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Geïnstalleerde stijlen beheren"
+		"message": "Geïnstalleerde stijlen beheren",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Update mislukt: server gaf code $code$ als antwoord.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -205,102 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specificeren"
+		"message": "Specificeren",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Update installeren"
+		"message": "Update installeren",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla-opmaak"
+		"message": "Mozilla-opmaak",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus werkt niet op pagina's als deze."
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Sectie verwijderen"
+		"message": "Sectie verwijderen",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Alle stijlen uitschakelen"
+		"message": "Alle stijlen uitschakelen",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
 	},
 	"undoGlobal": {
-		"message": "Ongedaan maken (globaal)"
+		"message": "Ongedaan maken (globaal)",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Update voltooid."
+		"message": "Update voltooid.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Bezig met controleren..."
+		"message": "Bezig met controleren...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
+	},
+	"sectionCode": {
+		"message": "Code",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "Slimme inspringing gebruiken"
+		"message": "Slimme inspringing gebruiken",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Gebruik de 'Toepasbaar op'-functies om de URL's te limiteren in de sectie."
+		"message": "Gebruik de 'Toepasbaar op'-functies om de URL's te limiteren in de sectie.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Stijl bewerken"
+		"message": "Stijl bewerken",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus werkt niet op pagina's als deze.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Stijl toevoegen"
+		"message": "Stijl toevoegen",
+		"description": "Title of the page for adding styles"
 	},
 	"importReplaceLabel": {
-		"message": "Stijl overschrijven"
+		"message": "Stijl overschrijven",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "Er is een fout opgetreden bij het gebruiken van de Stylus-database. Wilt u een webpagina met mogelijke oplossingen bezoeken?"
+		"message": "Er is een fout opgetreden bij het gebruiken van de Stylus-database. Wilt u een webpagina met mogelijke oplossingen bezoeken?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
 	},
 	"importAppendTooltip": {
-		"message": "Voeg de geïmporteerde stijl toe aan de huidige stijl"
+		"message": "Voeg de geïmporteerde stijl toe aan de huidige stijl",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
 	},
 	"helpKeyMapHotkey": {
-		"message": "Druk op een sneltoets"
+		"message": "Druk op een sneltoets",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
 	},
 	"replaceAll": {
-		"message": "Alles vervangen"
+		"message": "Alles vervangen",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "Ga naar regel (of regel:kolom)"
+		"message": "Ga naar regel (of regel:kolom)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Controleer alle stijlen op updates"
+		"message": "Controleer alle stijlen op updates",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
 	},
 	"issuesHelp": {
-		"message": "De door CSSLint gevonden problemen, <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>, met deze ingeschakelde regels:"
+		"message": "De door CSSLint gevonden problemen, <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>, met deze ingeschakelde regels:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
 	},
 	"confirmNo": {
-		"message": "Nee"
+		"message": "Nee",
+		"description": "'No' button in a confirm dialog"
 	},
 	"undo": {
-		"message": "Ongedaan maken"
+		"message": "Ongedaan maken",
+		"description": "Button label"
 	},
 	"cm_keyMap": {
-		"message": "Toetsenbordindeling"
+		"message": "Toetsenbordindeling",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "Tabs met slimme inspringing gebruiken"
+		"message": "Tabs met slimme inspringing gebruiken",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
 	"replaceWith": {
-		"message": "Vervangen door"
+		"message": "Vervangen door",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Verwijderen"
+		"message": "Verwijderen",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Nieuwe stijl schrijven"
+		"message": "Nieuwe stijl schrijven",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "Alleen ingeschakelde stijlen"
+		"message": "Alleen ingeschakelde stijlen",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Bewerken"
+		"message": "Bewerken",
+		"description": "Label for the button to go to the edit style page"
 	},
 	"cm_theme": {
-		"message": "Thema"
+		"message": "Thema",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "Voer een naam in voor het commando"
+		"message": "Voer een naam in voor het commando",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Voorzie het web van een ander uiterlijk met Stylus, een gebruikersstijlbeheerder. Stylus stelt u in staat om eenvoudig thema's en stijlen te installeren voor vele populaire websites."
+		"message": "Voorzie het web van een ander uiterlijk met Stylus, een gebruikersstijlbeheerder. Stylus stelt u in staat om eenvoudig thema's en stijlen te installeren voor vele populaire websites.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index 29ef8b34..d42a411d 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -1,85 +1,354 @@
 {
 	"appliesToEverything": {
-		"message": "Tudo"
+		"message": "Tudo",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "default",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Export",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
+	},
+	"cm_tabSize": {
+		"message": "Tab size",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Ativar"
+		"message": "Ativar",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Insira um nome."
+		"message": "Insira um nome.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URLs no domínio"
+		"message": "URLs no domínio",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Verificar atualizações"
+		"message": "Verificar atualizações",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
+	},
+	"updateAllCheckSucceededNoUpdate": {
+		"message": "No updates found.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Ajuda"
+		"message": "Ajuda",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Yes",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Procurar mais estilos para este site"
+		"message": "Procurar mais estilos para este site",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Estilos instalados"
+		"message": "Estilos instalados",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Ativado"
+		"message": "Ativado",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "O formato Mozilla do código pode ser usado com o Stylish para Firefox e pode ser enviado para userstyles.org."
+		"message": "O formato Mozilla do código pode ser usado com o Stylish para Firefox e pode ser enviado para userstyles.org.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Adicionar outra seção"
+		"message": "Adicionar outra seção",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Salvar"
+		"message": "Salvar",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
+	},
+	"writeStyleForURL": {
+		"message": "this URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Adicionar"
+		"message": "Adicionar",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URLs que correspondem a regexp"
+		"message": "URLs que correspondem a regexp",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "Instalar \"$stylename$\" no Stylus?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "Desativar"
+		"message": "Desativar",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Show number of styles active for the current site on the toolbar button"
+		"message": "Show number of styles active for the current site on the toolbar button",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "Show active style count",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+	},
+	"cm_lineWrapping": {
+		"message": "Word wrap",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Voltar ao gerenciamento"
+		"message": "Voltar ao gerenciamento",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Você fez alterações neste estilo sem salvar."
+		"message": "Você fez alterações neste estilo sem salvar.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "A atualização falhou: servidor inacessível."
+		"message": "A atualização falhou: servidor inacessível.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "Filters",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "Apply all updates",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Tem certeza de que deseja excluir este estilo?"
+		"message": "Tem certeza de que deseja excluir este estilo?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
+	},
+	"styleBadRegexp": {
+		"message": "Regexp is invalid.",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "Options",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Aplica-se a: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
+	"styleUpdate": {
+		"message": "Are you sure you want to update '$stylename$'?",
+		"description": "Confirmation when updating a style",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
 	"styleSectionsTitle": {
-		"message": "Seções"
+		"message": "Seções",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Editar estilo $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -87,31 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "O estilo está atualizado."
+		"message": "O estilo está atualizado.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URLs que começam com"
+		"message": "URLs que começam com",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
+	},
+	"popupStylesFirst": {
+		"message": "Styles before commands",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "As seções permitem definir diferentes partes de código para aplicar a diferentes conjuntos de URLs no mesmo estilo. Por exemplo, um único estilo poderia alterar a página inicial de um site de uma forma, enquanto alteraria o resto do site de outra forma."
+		"message": "As seções permitem definir diferentes partes de código para aplicar a diferentes conjuntos de URLs no mesmo estilo. Por exemplo, um único estilo poderia alterar a página inicial de um site de uma forma, enquanto alteraria o resto do site de outra forma.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Nenhum estilo instalado para este site."
+		"message": "Nenhum estilo instalado para este site.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "e mais"
+		"message": "e mais",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Remover"
+		"message": "Remover",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "Write style for: ",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Aplica-se a"
+		"message": "Aplica-se a",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Gerenciar estilos instalados"
+		"message": "Gerenciar estilos instalados",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "A atualização falhou: o  servidor respondeu com código $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -119,45 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Especificar"
+		"message": "Especificar",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Instalar atualização"
+		"message": "Instalar atualização",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Remover seção"
+		"message": "Remover seção",
+		"description": "Label for the button to remove a section"
+	},
+	"disableAllStyles": {
+		"message": "Turn all styles off",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Atualização concluída."
+		"message": "Atualização concluída.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Verificando..."
+		"message": "Verificando...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Código"
+		"message": "Código",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "Use smart indentation",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Use os controles \"Aplica-se a\" para limitar a quais URLs o código desta seção se aplica."
+		"message": "Use os controles \"Aplica-se a\" para limitar a quais URLs o código desta seção se aplica.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Editar estilo"
+		"message": "Editar estilo",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus doesn't work on pages like this.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Adicionar estilo"
+		"message": "Adicionar estilo",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"dbError": {
+		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "Goto line (or line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Verificar atualizações para todos os estilos"
+		"message": "Verificar atualizações para todos os estilos",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Keymap",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "Use tabs with smart indentation",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Excluir"
+		"message": "Excluir",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Gravar novo estilo"
+		"message": "Gravar novo estilo",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "Only enabled styles",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Editar"
+		"message": "Editar",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Type a command name",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Mude o estilo da web com o Stylus, um gerenciador de estilos do usuário. O Stylus permite instalar facilmente temas e skins para Google, Facebook, YouTube, Orkut e muitos, muitos outros sites."
+		"message": "Mude o estilo da web com o Stylus, um gerenciador de estilos do usuário. O Stylus permite instalar facilmente temas e skins para Google, Facebook, YouTube, Orkut e muitos, muitos outros sites.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index 718d1d4a..5fb8ad26 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -1,150 +1,207 @@
 {
 	"appliesToEverything": {
-		"message": "Все"
+		"message": "Все",
+		"description": "Text displayed for styles that apply to all sites"
 	},
 	"defaultTheme": {
-		"message": "по-умолчанию"
+		"message": "по-умолчанию",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
 	},
 	"styleRegexpTestTitle": {
-		"message": "Список соответствующих вкладок (щелкните на адресе, чтобы активировать)"
+		"message": "Список соответствующих вкладок (щелкните на адресе, чтобы активировать)",
+		"description": "RegExp test report: title of the report"
 	},
 	"bckpInstStyles": {
-		"message": "Экспорт стилей"
+		"message": "Экспорт стилей",
+		"description": ""
 	},
 	"optionsUpdateInterval": {
-		"message": "Автоматически проверять и устанавливать обновления стилей (интервал в часах)"
+		"message": "Автоматически проверять и устанавливать обновления стилей (интервал в часах)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Нажмите Alt-Enter чтобы включить/выключить стиль и сохранить его.",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
 	},
 	"exportLabel": {
-		"message": "Экспорт"
+		"message": "Экспорт",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
 	"issues": {
-		"message": "Проблемы"
+		"message": "Проблемы",
+		"description": "Label for the CSSLint issues block on the style edit page"
 	},
 	"optionsBadgeNormal": {
-		"message": "Цвет фона"
+		"message": "Цвет фона",
+		"description": ""
 	},
 	"updateCheckHistory": {
-		"message": "История проверок обновлений"
+		"message": "История проверок обновлений",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Размер табуляции"
+		"message": "Размер табуляции",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Включить"
+		"message": "Включить",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Введите название."
+		"message": "Введите название.",
+		"description": "Error displayed when user saves without providing a name"
 	},
 	"genericHistoryLabel": {
-		"message": "История"
+		"message": "История",
+		"description": "Used in various places to show a history log of something"
 	},
 	"shortcutsNote": {
-		"message": "Назначить клавишу"
+		"message": "Назначить клавишу",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URL в домене"
+		"message": "URL в домене",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Проверить обновление"
+		"message": "Проверить обновление",
+		"description": "Label for the button to check a single style for an update"
 	},
 	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Стиль не был применен из-за некорректного regexp()"
+		"message": "Стиль не был применен из-за некорректного regexp()",
+		"description": "Tooltip in the popup for styles that were not applied at all"
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "Некоторые 'regexp()' выражения не удалось скомпилировать."
+		"message": "Некоторые 'regexp()' выражения не удалось скомпилировать.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Тёмный интерфейс браузера",
+		"description": ""
 	},
 	"importAppendLabel": {
-		"message": "Добавить к стилю"
+		"message": "Добавить к стилю",
+		"description": "Label for the button to import a style and append to the existing sections"
 	},
 	"optionsOpenManager": {
-		"message": "Менеджер стилей"
+		"message": "Менеджер стилей",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Обновлений нет."
+		"message": "Обновлений нет.",
+		"description": "Text that displays when an update all check completed and no updates are available"
 	},
 	"importReportLegendAdded": {
-		"message": "добавлено"
+		"message": "добавлено",
+		"description": "Text after the number of styles added in the report shown after importing styles"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "Вставьте содержимое стиля в формате Mozilla"
+		"message": "Вставьте содержимое стиля в формате Mozilla",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
 	},
 	"dragDropMessage": {
-		"message": "Перетащите файл с резервной копией стилей в любое место этой страницы, чтобы импортировать его."
+		"message": "Перетащите файл с резервной копией стилей в любое место этой страницы, чтобы импортировать его.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Справка"
+		"message": "Справка",
+		"description": "Alternate text for help buttons"
 	},
 	"confirmOK": {
-		"message": "ОК"
+		"message": "ОК",
+		"description": ""
 	},
 	"search": {
-		"message": "Искать"
+		"message": "Искать",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
 	},
 	"manageFaviconsGray": {
-		"message": "Обесцвечивать"
+		"message": "Обесцвечивать",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
 	},
 	"confirmYes": {
-		"message": "Да"
+		"message": "Да",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Найти еще стили для этого веб-сайта"
+		"message": "Найти еще стили для этого веб-сайта",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Установленные стили"
+		"message": "Установленные стили",
+		"description": "Heading for the manage page"
 	},
 	"styleBeautify": {
-		"message": "Форматировать"
+		"message": "Форматировать",
+		"description": "Label for the CSS-beautifier button on the edit style page"
 	},
 	"styleRegexpProblemTooltip": {
-		"message": "Кол-во пропущенных секций из-за неправильного regexp()"
+		"message": "Кол-во пропущенных секций из-за неправильного regexp()",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Включено"
+		"message": "Включено",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Формат кода Mozilla можно отправлять на сайт userstyles.org и использовать в дополнении Stylish для Firefox."
+		"message": "Формат кода Mozilla можно отправлять на сайт userstyles.org и использовать в дополнении Stylish для Firefox.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Добавить раздел"
+		"message": "Добавить раздел",
+		"description": "Label for the button to add a section"
 	},
 	"styleRegexpTestPartial": {
-		"message": "Не применено, т.к. соответствие не полное"
+		"message": "Не применено, т.к. соответствие не полное",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Сохранить"
+		"message": "Сохранить",
+		"description": "Label for save button for style editing"
 	},
 	"confirmDelete": {
-		"message": "Удалить"
+		"message": "Удалить",
+		"description": ""
 	},
 	"confirmCancel": {
-		"message": "Отмена"
+		"message": "Отмена",
+		"description": ""
 	},
 	"retrieveBckp": {
-		"message": "Импорт стилей"
+		"message": "Импорт стилей",
+		"description": ""
 	},
 	"confirmStop": {
-		"message": "Стоп"
+		"message": "Стоп",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "этого адреса"
+		"message": "этого адреса",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
 	"optionsSubheading": {
-		"message": "Дополнительно"
+		"message": "Дополнительно",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Добавить"
+		"message": "Добавить",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URL, соответствующим регулярному выражению"
+		"message": "URL, соответствующим регулярному выражению",
+		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "Позволяет писать CSS, работающий только внутри iframe, например: html[stylus-iframe] h1 { display:none }"
+		"message": "Позволяет писать CSS, работающий только внутри iframe, например: html[stylus-iframe] h1 { display:none }",
+		"description": ""
 	},
 	"importReportLegendUpdatedCode": {
-		"message": "обновлен код"
+		"message": "обновлен код",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "Установить \"$stylename$\" в Stylus?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -152,96 +209,129 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "Цвет фона в неактивном состоянии"
+		"message": "Цвет фона в неактивном состоянии",
+		"description": ""
 	},
 	"optionsCheck": {
-		"message": "Обновить стили"
+		"message": "Обновить стили",
+		"description": ""
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>Скачать стили с userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Справка</a>"
+		"message": "<a href='https://userstyles.org'>Скачать стили с userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Справка</a>",
+		"description": "Help text on the manage page"
 	},
 	"manageOnlyLocal": {
-		"message": "Только локально созданные стили"
+		"message": "Только локально созданные стили",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"searchStyles": {
-		"message": "Искать по содержимому"
+		"message": "Искать по содержимому",
+		"description": "Label for the search filter textbox on the Manage styles page"
 	},
 	"optionsUpdateImportNote": {
-		"message": "После импорта базы стилей из старой версии или из Stylish запустите проверку на обновления из менеджера стилей, чтобы удостовериться в обновлении всех стилей."
+		"message": "После импорта базы стилей из старой версии или из Stylish запустите проверку на обновления из менеджера стилей, чтобы удостовериться в обновлении всех стилей.",
+		"description": ""
 	},
 	"checkAllUpdatesForce": {
-		"message": "Я не менял стили, проверить заново!"
+		"message": "Я не менял стили, проверить заново!",
+		"description": "Label for the button to apply all detected updates"
 	},
 	"unreachableFileHint": {
-		"message": "Доступ к адресам file:// возможен только если включить соответствующую опцию для Stylus на странице chrome://extensions."
+		"message": "Доступ к адресам file:// возможен только если включить соответствующую опцию для Stylus на странице chrome://extensions.",
+		"description": "Note in the toolbar popup for file:// URLs"
 	},
 	"disableStyleLabel": {
-		"message": "Отключить"
+		"message": "Отключить",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Показывать количество активных стилей для открытого сайта"
+		"message": "Показывать количество активных стилей для открытого сайта",
+		"description": "Label for the checkbox controlling toolbar badge text."
 	},
 	"manageFavicons": {
-		"message": "Пиктограммы для целевых сайтов"
+		"message": "Пиктограммы для целевых сайтов",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "Число активных стилей"
+		"message": "Число активных стилей",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "Перенос по словам"
+		"message": "Перенос по словам",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Завершить"
+		"message": "Завершить",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Вы изменили этот стиль, но не сохранили его."
+		"message": "Вы изменили этот стиль, но не сохранили его.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
 	"importLabel": {
-		"message": "Импорт"
+		"message": "Импорт",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"shortcuts": {
-		"message": "Клавиши"
+		"message": "Клавиши",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Ошибка обновления: сервер недоступен."
+		"message": "Ошибка обновления: сервер недоступен.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "Фильтры"
+		"message": "Фильтры",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "Применить все обновления"
+		"message": "Применить все обновления",
+		"description": "Label for the button to apply all detected updates"
 	},
 	"optionsReset": {
-		"message": "Сброс настроек к значениям по-умолчанию"
+		"message": "Сброс настроек к значениям по-умолчанию",
+		"description": ""
 	},
 	"optionsCustomizeUpdate": {
-		"message": "Обновления"
+		"message": "Обновления",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Удалить этот стиль?"
+		"message": "Удалить этот стиль?",
+		"description": "Confirmation before deleting a style"
 	},
 	"optionsCustomizePopup": {
-		"message": "Всплывающее окно"
+		"message": "Всплывающее окно",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Ошибка в регулярном выражении."
+		"message": "Ошибка в регулярном выражении.",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "Настройки"
+		"message": "Настройки",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Применить к: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Светлый интерфейс браузера",
+		"description": ""
+	},
 	"openStylesManager": {
-		"message": "Менеджер стилей"
+		"message": "Менеджер стилей",
+		"description": "Label for the style maanger opener in the browser action context menu."
 	},
 	"styleUpdate": {
 		"message": "Подтвердите обновление стиля '$stylename$'.",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -249,13 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Разделы"
+		"message": "Разделы",
+		"description": "Title for the style sections section"
 	},
 	"importReportLegendInvalid": {
-		"message": "некорректных пропущено"
+		"message": "некорректных пропущено",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Изменение стиля \"$stylename$\"",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -263,70 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Нет обновлений."
+		"message": "Нет обновлений.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL, начинающимся с"
+		"message": "URL, начинающимся с",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
 	"cm_matchHighlightToken": {
-		"message": "Элемент под курсором"
+		"message": "Элемент под курсором",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
 	},
 	"searchRegexp": {
-		"message": "Используйте нотацию /re/ для поиска регулярными выражениями"
+		"message": "Используйте нотацию /re/ для поиска регулярными выражениями",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
 	},
 	"updateCheckManualUpdateHint": {
-		"message": "Форсирование обновления удалит локальные изменения."
+		"message": "Форсирование обновления удалит локальные изменения.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"toggleStyle": {
-		"message": "Включить/выключить стиль"
+		"message": "Включить/выключить стиль",
+		"description": "Label for the checkbox to enable/disable a style"
 	},
 	"importReplaceTooltip": {
-		"message": "Удалить содержимое редактируемого стиля и заменить его на импортируемый стиль"
+		"message": "Удалить содержимое редактируемого стиля и заменить его на импортируемый стиль",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Двойной клик = переключить максимальный размер",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "Список стилей сверху"
+		"message": "Список стилей сверху",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Разделы позволяют задавать разный код для различных наборов URL в пределах одного стиля. Например, стиль может применяться к главной странице не так, как к остальным частям сайта."
+		"message": "Разделы позволяют задавать разный код для различных наборов URL в пределах одного стиля. Например, стиль может применяться к главной странице не так, как к остальным частям сайта.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Для этого веб-сайта не установлено ни одного стиля."
+		"message": "Для этого веб-сайта не установлено ни одного стиля.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "и другие"
+		"message": "и другие",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Удалить"
+		"message": "Удалить",
+		"description": "Label for the button to remove an 'applies' entry"
 	},
 	"updatesCurrentlyInstalled": {
-		"message": "Установлено обновлений:"
+		"message": "Установлено обновлений:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Стиль в формате Mozilla"
+		"message": "Стиль в формате Mozilla",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "Создать стиль для:"
+		"message": "Создать стиль для:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
 	"replace": {
-		"message": "Заменить"
+		"message": "Заменить",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
 	},
 	"styleRegexpTestNone": {
-		"message": "Нет соответствующих вкладок"
+		"message": "Нет соответствующих вкладок",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
 	},
 	"importReportLegendUpdatedMeta": {
-		"message": "обновлены мета-данные"
+		"message": "обновлены мета-данные",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Применить к:"
+		"message": "Применить к:",
+		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
 	"openOptionsPopup": {
-		"message": "Настройки"
+		"message": "Настройки",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Менеджер"
+		"message": "Менеджер",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Ошибка обновления: сервер вернул код $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -334,219 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Указать"
+		"message": "Указать",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Установить обновление"
+		"message": "Установить обновление",
+		"description": "Label for the button to install an update for a single style"
 	},
 	"optionsCheckUpdate": {
-		"message": "Найти и установить обновления стилей"
+		"message": "Найти и установить обновления стилей",
+		"description": ""
 	},
 	"importReportTitle": {
-		"message": "Импорт стилей завершен"
+		"message": "Импорт стилей завершен",
+		"description": "Title of the report shown after importing styles"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Формат Mozilla"
+		"message": "Формат Mozilla",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
 	"cm_matchHighlight": {
-		"message": "Подсвечивать"
+		"message": "Подсвечивать",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
 	},
 	"styleRegexpPartialExplanation": {
-		"message": "В стиле используются regexp-выражения, которые соответствуют лишь части адреса, что нарушает <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>спецификацию CSS4 @document</a>, требующую соответствия всего адреса целиком. Секции стиля с такими regexp не были применены к странице. Вероятно, этот стиль был создан в \"Stylish для Chrome\", который некорректно проверяет regexp (известный баг)."
+		"message": "В стиле используются regexp-выражения, которые соответствуют лишь части адреса, что нарушает <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>спецификацию CSS4 @document</a>, требующую соответствия всего адреса целиком. Секции стиля с такими regexp не были применены к странице. Вероятно, этот стиль был создан в \"Stylish для Chrome\", который некорректно проверяет regexp (известный баг).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Отступ внутри @media, @supports",
+		"description": "CSS-beautifier option"
 	},
 	"unreachableContentScript": {
-		"message": "Нет связи со страницей. Попробуйте перезагрузить вкладку."
+		"message": "Нет связи со страницей. Попробуйте перезагрузить вкладку.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Удалить раздел"
+		"message": "Удалить раздел",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Выключить все стили"
+		"message": "Выключить все стили",
+		"description": "Label for the checkbox that turns all enabled styles off."
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "Возможно был изменен локально."
+		"message": "Возможно был изменен локально.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
 	},
 	"undoGlobal": {
-		"message": "Отменить (глобально)"
+		"message": "Отменить (глобально)",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Значок в панели",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Обновление завершено."
+		"message": "Обновление завершено.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Проверка…"
+		"message": "Проверка…",
+		"description": "Text to display when checking a style for an update"
 	},
 	"styleRegexpTestFull": {
-		"message": "Соответствующие вкладки"
+		"message": "Соответствующие вкладки",
+		"description": "RegExp test report: label for the fully matching expressions"
 	},
 	"manageMaxTargets": {
-		"message": "Кол-во целевых сайтов/выражений"
+		"message": "Кол-во целевых сайтов/выражений",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
 	},
 	"manageFaviconsHelp": {
-		"message": "Используется сторонний сервис https://www.google.com/s2/favicons"
+		"message": "Используется сторонний сервис https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"updateCheckSkippedLocallyEdited": {
-		"message": "Стиль был изменен локально."
+		"message": "Стиль был изменен локально.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsResetButton": {
-		"message": "Сброс настроек"
+		"message": "Сброс настроек",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Код"
+		"message": "Код",
+		"description": "Label for the code for a section"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "Показывать команду \"Удалить\" в контекстном меню редактора"
+		"message": "Показывать команду \"Удалить\" в контекстном меню редактора",
+		"description": ""
 	},
 	"importReportLegendUpdatedBoth": {
-		"message": "обновлены мета-данные и код"
+		"message": "обновлены мета-данные и код",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "Умные отступы"
+		"message": "Умные отступы",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
 	"styleRegexpTestButton": {
-		"message": "Тест регулярки"
+		"message": "Тест регулярки",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Чтобы указать, к каким URL относится код в этом разделе, воспользуйтесь параметром \"Применить к\"."
+		"message": "Чтобы указать, к каким URL относится код в этом разделе, воспользуйтесь параметром \"Применить к\".",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Изменение стиля"
+		"message": "Изменение стиля",
+		"description": "Title of the page for editing styles"
 	},
 	"editDeleteText": {
-		"message": "Удалить"
+		"message": "Удалить",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Подсказки при наборе кода",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "В целях обеспечения безопасности браузер запрещает расширениям изменять встроенные страницы (например, chrome://version, about:addons), страницы других расширений и \"магазин\" расширений (Chrome Web Store в chromium-браузерах, AMO в Firefox и т.д.)",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
 	"cm_matchHighlightSelection": {
-		"message": "Выделенный текст"
+		"message": "Выделенный текст",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
 	},
 	"updateAllCheckSucceededSomeEdited": {
-		"message": "Не все стили были проверены, чтобы не потерять возможные локальные изменения. Форсировать обновление стиля можно индивидуально или запустив перепроверку всех обновляемых стилей (локальные изменения будут утеряны)."
+		"message": "Не все стили были проверены, чтобы не потерять возможные локальные изменения. Форсировать обновление стиля можно индивидуально или запустив перепроверку всех обновляемых стилей (локальные изменения будут утеряны).",
+		"description": "Text that displays when an update all check completed and no updates are available"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Такие адреса не поддерживаются."
+		"message": "Такие адреса не поддерживаются.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
 	"manageOnlyUpdates": {
-		"message": "Только обновляемые и проблемные"
+		"message": "Только обновляемые и проблемные",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Добавление стиля"
+		"message": "Добавление стиля",
+		"description": "Title of the page for adding styles"
 	},
 	"importReplaceLabel": {
-		"message": "Заменить стиль"
+		"message": "Заменить стиль",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "Возникла ошибка доступа к базе данных Stylus. Хотите перейти на страницу с возможными способами решения?"
+		"message": "Возникла ошибка доступа к базе данных Stylus. Хотите перейти на страницу с возможными способами решения?",
+		"description": "Prompt when a DB error is encountered"
 	},
 	"optionsAdvanced": {
-		"message": "Другое"
+		"message": "Другое",
+		"description": ""
 	},
 	"importAppendTooltip": {
-		"message": "Добавить импортируемый стиль к редактируемому"
+		"message": "Добавить импортируемый стиль к редактируемому",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
 	},
 	"editorStylesButton": {
-		"message": "Сменить тему Стилус"
+		"message": "Сменить тему Стилус",
+		"description": "Find styles for the editor"
 	},
 	"optionsOpen": {
-		"message": "Открыть"
+		"message": "Открыть",
+		"description": ""
 	},
 	"helpKeyMapHotkey": {
-		"message": "Нажмите клавишу"
+		"message": "Нажмите клавишу",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "Пропущены некомпилируемые регулярки"
+		"message": "Пропущены некомпилируемые регулярки",
+		"description": "RegExp test report: label for the invalid expressions"
 	},
 	"replaceAll": {
-		"message": "Заменить все"
+		"message": "Заменить все",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
 	},
 	"importReportUnchanged": {
-		"message": "Ничего не изменилось."
+		"message": "Ничего не изменилось.",
+		"description": "Message in the report shown after importing styles"
 	},
 	"optionsActions": {
-		"message": "Другие действия"
+		"message": "Другие действия",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "Перейти к строке (или строке:колонке)"
+		"message": "Перейти к строке (или строке:колонке)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
 	},
 	"manageOnlyLocalTooltip": {
-		"message": "(т.е. стили, не установленные посредством сайта userstyles.org)"
+		"message": "(т.е. стили, не установленные посредством сайта userstyles.org)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Найти обновления всех стилей"
+		"message": "Найти обновления всех стилей",
+		"description": "Label for the button to check all styles for updates"
 	},
 	"openOptionsManage": {
-		"message": "Настройки"
+		"message": "Настройки",
+		"description": "Go to Options UI"
 	},
 	"issuesHelp": {
-		"message": "Проблемы и предупреждения по версии <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> с данными включенными правилами:"
+		"message": "Проблемы и предупреждения по версии <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> с данными включенными правилами:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
 	},
 	"optionsCustomizeBadge": {
-		"message": "Бейдж на пиктограмме в тулбаре"
+		"message": "Бейдж на пиктограмме в тулбаре",
+		"description": ""
 	},
 	"importReportLegendIdentical": {
-		"message": "идентичные пропущены"
+		"message": "идентичные пропущены",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
 	},
 	"optionsPopupWidth": {
-		"message": "Ширина всплывающего окна (в пикселах)"
+		"message": "Ширина всплывающего окна (в пикселах)",
+		"description": ""
 	},
 	"confirmNo": {
-		"message": "Нет"
+		"message": "Нет",
+		"description": "'No' button in a confirm dialog"
 	},
 	"undo": {
-		"message": "Отменить"
+		"message": "Отменить",
+		"description": "Button label"
 	},
 	"cm_keyMap": {
-		"message": "Раскладка"
+		"message": "Раскладка",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
 	},
 	"manageNewUI": {
-		"message": "Новый интерфейс"
+		"message": "Новый интерфейс",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
 	},
 	"importReportUndoneTitle": {
-		"message": "Откат импорта завершен"
+		"message": "Откат импорта завершен",
+		"description": "Title of the message box shown after undoing the import of styles"
 	},
 	"genericDisabledLabel": {
-		"message": "Отключен"
+		"message": "Отключен",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "Умные отступы при помощи табуляции"
+		"message": "Умные отступы при помощи табуляции",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
 	"replaceWith": {
-		"message": "Заменить на"
+		"message": "Заменить на",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Удалить"
+		"message": "Удалить",
+		"description": "Label for the button to delete a style"
 	},
 	"updateCheckManualUpdateForce": {
-		"message": "Установить обновление (локальные изменения будут утеряны)"
+		"message": "Установить обновление (локальные изменения будут утеряны)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsAdvancedExposeIframes": {
-		"message": "Выявлять iframe путем добавления HTML[stylus-iframe]"
+		"message": "Выявлять iframe путем добавления HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Создать стиль"
+		"message": "Создать стиль",
+		"description": "Label for the button to go to the add style page"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "Для отключения автоматического обновления стилей введите 0 (ноль)"
+		"message": "Для отключения автоматического обновления стилей введите 0 (ноль)",
+		"description": ""
 	},
 	"backupButtons": {
-		"message": "Резервное копирование"
+		"message": "Резервное копирование",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "Только включенные стили"
+		"message": "Только включенные стили",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Изменить"
+		"message": "Изменить",
+		"description": "Label for the button to go to the edit style page"
 	},
 	"cm_theme": {
-		"message": "Тема"
+		"message": "Тема",
+		"description": "Label for the style editor's CSS theme."
 	},
 	"backupMessage": {
-		"message": "Нажмите Импорт чтобы выбрать файл или просто перетащите его на эту страницу"
+		"message": "Нажмите Импорт чтобы выбрать файл или просто перетащите его на эту страницу",
+		"description": "Message for backup"
 	},
 	"importReportUndone": {
-		"message": "восстановленных стилей"
+		"message": "восстановленных стилей",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "Введите имя команды"
+		"message": "Введите имя команды",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Настраивайте стили веб-сайтов с помощью менеджера стилей Stylus. Он позволяет легко установить темы и изменить внешний вид сайтов Google, Facebook, YouTube, Orkut и множества других веб-страниц."
+		"message": "Настраивайте стили веб-сайтов с помощью менеджера стилей Stylus. Он позволяет легко установить темы и изменить внешний вид сайтов Google, Facebook, YouTube, Orkut и множества других веб-страниц.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index 4b7e89ba..2cfabf6b 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -1,315 +1,767 @@
-{
-	"appliesToEverything": {
-		"message": "Све"
-	},
-	"defaultTheme": {
-		"message": "подразумевано"
-	},
-	"exportLabel": {
-		"message": "Извези"
-	},
-	"issues": {
-		"message": "Проблеми"
-	},
-	"cm_tabSize": {
-		"message": "Величина картице"
-	},
-	"enableStyleLabel": {
-		"message": "Омогући"
-	},
-	"styleMissingName": {
-		"message": "Унесите назив"
-	},
-	"appliesDomainOption": {
-		"message": "УРЛ адресе на домену"
-	},
-	"checkForUpdate": {
-		"message": "Проверите ажурирање"
-	},
-	"importAppendLabel": {
-		"message": "Додај стилу"
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "Сви стилови су ажурирани."
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Налепи код у Mozilla формату"
-	},
-	"helpAlt": {
-		"message": "Помоћ"
-	},
-	"search": {
-		"message": "Претражи"
-	},
-	"confirmYes": {
-		"message": "Да"
-	},
-	"findStylesForSite": {
-		"message": "Пронађи још стилова за овај сајт"
-	},
-	"manageHeading": {
-		"message": "Инсталирани стилови"
-	},
-	"styleBeautify": {
-		"message": "Улепшај"
-	},
-	"styleEnabledLabel": {
-		"message": "Омогућено"
-	},
-	"styleToMozillaFormatHelp": {
-		"message": "Mozilla формат кода се може користити у Stylish за Firefox и може се послати на userstyles.org."
-	},
-	"sectionAdd": {
-		"message": "Додај нови одељак"
-	},
-	"styleSaveLabel": {
-		"message": "Сачувај"
-	},
-	"confirmStop": {
-		"message": "Заустави"
-	},
-	"writeStyleForURL": {
-		"message": "ову УРЛ адресу"
-	},
-	"appliesAdd": {
-		"message": "Додај"
-	},
-	"appliesRegexpOption": {
-		"message": "УРЛ адресе које одговарају регуларном изразу"
-	},
-	"styleInstall": {
-		"message": "Инсталирати '$stylename$' у Stylus?",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Преузмите стилове са userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Помоћ</a>"
-	},
-	"searchStyles": {
-		"message": "Претражи садржај"
-	},
-	"disableStyleLabel": {
-		"message": "Онемогући"
-	},
-	"prefShowBadge": {
-		"message": "Прикажи број активних стилова за тренутни сајт на дугмету на алатној траци"
-	},
-	"menuShowBadge": {
-		"message": "Прикажи број активних стилова"
-	},
-	"cm_lineWrapping": {
-		"message": "Преламање текста"
-	},
-	"styleCancelEditLabel": {
-		"message": "Назад на управљање"
-	},
-	"styleChangesNotSaved": {
-		"message": "Направили сте измене овог стила које нисте сачували."
-	},
-	"importLabel": {
-		"message": "Увези"
-	},
-	"updateCheckFailServerUnreachable": {
-		"message": "Ажурирање није успело: сервер није доступан."
-	},
-	"manageFilters": {
-		"message": "Филтери"
-	},
-	"applyAllUpdates": {
-		"message": "Примени сва ажурирања"
-	},
-	"deleteStyleConfirm": {
-		"message": "Да ли сте сигурни да желите да избришете овај стил?"
-	},
-	"styleBadRegexp": {
-		"message": "Регуларни израз је неисправан."
-	},
-	"optionsHeading": {
-		"message": "Опције"
-	},
-	"appliesDisplay": {
-		"message": "Примењује се на: $applies$",
-		"placeholders": {
-			"applies": {
-				"content": "$1"
-			}
-		}
-	},
-	"styleUpdate": {
-		"message": "Да ли сте сигурни да желите да ажурирате '$stylename$'?",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
-	"styleSectionsTitle": {
-		"message": "Одељци"
-	},
-	"editStyleTitle": {
-		"message": "Уреди стил $stylename$",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
-	"updateCheckSucceededNoUpdate": {
-		"message": "Стил је ажуриран."
-	},
-	"appliesUrlPrefixOption": {
-		"message": "УРЛ адресе које почињу са"
-	},
-	"searchRegexp": {
-		"message": "Користи /re/ синтаксу за претрагу  регуларним изразом"
-	},
-	"importReplaceTooltip": {
-		"message": "Одбаци садржај тренутног стила и упиши преко њега увезени стил"
-	},
-	"popupStylesFirst": {
-		"message": "Излистај стилове пре команди у менију дугмета на алатној траци"
-	},
-	"sectionHelp": {
-		"message": "Одељци вам омогућавају да дефинишете различите делове кода који се примењују на раличите скупове УРЛ-ова у истом стилу. На пример, један исти стил може променити почетну страницу једног сајта на један начин а остатак сајта на други начин."
-	},
-	"noStylesForSite": {
-		"message": "Нема инсталираних стилова за овај сајт."
-	},
-	"appliesDisplayTruncatedSuffix": {
-		"message": "и још"
-	},
-	"appliesRemove": {
-		"message": "Уклони"
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Стил у Mozilla формату"
-	},
-	"writeStyleFor": {
-		"message": "Упиши стил за:"
-	},
-	"replace": {
-		"message": "Замени"
-	},
-	"appliesLabel": {
-		"message": "Примењује се на"
-	},
-	"openManage": {
-		"message": "Управљај инсталираним стиловима"
-	},
-	"updateCheckFailBadResponseCode": {
-		"message": "Ажурирање није успело: сервер је одговорио кодом $code$.",
-		"placeholders": {
-			"code": {
-				"content": "$1"
-			}
-		}
-	},
-	"appliesSpecify": {
-		"message": "Детаљније"
-	},
-	"installUpdate": {
-		"message": "Инсталирај ажурирање"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla формат"
-	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus не ради на страницама као што је ова."
-	},
-	"sectionRemove": {
-		"message": "Уклони одељак"
-	},
-	"disableAllStyles": {
-		"message": "Искључи све стилове"
-	},
-	"undoGlobal": {
-		"message": "Опозови (свеобухватно)"
-	},
-	"updateCompleted": {
-		"message": "Ажурирање је комплетирано."
-	},
-	"checkingForUpdate": {
-		"message": "Проверавање..."
-	},
-	"sectionCode": {
-		"message": "Код"
-	},
-	"cm_smartIndent": {
-		"message": "Користи паметно увлачење редова"
-	},
-	"appliesHelp": {
-		"message": "Употреба 'Примењује се на' одређује опсег УРЛ адреса на које се код у овом одељку примењује."
-	},
-	"editStyleHeading": {
-		"message": "Уреди стил"
-	},
-	"appliesUrlOption": {
-		"message": "УРЛ"
-	},
-	"addStyleTitle": {
-		"message": "Додај стил"
-	},
-	"importReplaceLabel": {
-		"message": "Упиши преко стила"
-	},
-	"dbError": {
-		"message": "Дошло је до грешке користећи Stylus базу података. Да ли желите да посетите веб страницу са могућим решењима?"
-	},
-	"importAppendTooltip": {
-		"message": "Додај увезени стил тренутном стилу"
-	},
-	"helpKeyMapHotkey": {
-		"message": "Притисни пречицу"
-	},
-	"replaceAll": {
-		"message": "Замени све"
-	},
-	"editGotoLine": {
-		"message": "Иди на ред (или line:col)"
-	},
-	"checkAllUpdates": {
-		"message": "Проверите ажурирања за све стилове"
-	},
-	"issuesHelp": {
-		"message": "Проблем пронађен од стране <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> са овим омогућеним правилима:"
-	},
-	"confirmNo": {
-		"message": "Не"
-	},
-	"undo": {
-		"message": "Опозови"
-	},
-	"cm_keyMap": {
-		"message": "Мапа тастера"
-	},
-	"cm_indentWithTabs": {
-		"message": "Користи картице са паметним увлачењем редова"
-	},
-	"replaceWith": {
-		"message": "Замени са"
-	},
-	"deleteStyleLabel": {
-		"message": "Избриши"
-	},
-	"addStyleLabel": {
-		"message": "Упиши нови стил"
-	},
-	"manageOnlyEnabled": {
-		"message": "Само омогућени стилови"
-	},
-	"editStyleLabel": {
-		"message": "Уреди"
-	},
-	"cm_theme": {
-		"message": "Тема"
-	},
-	"helpKeyMapCommand": {
-		"message": "Укуцај име команде"
-	},
-	"description": {
-		"message": "Измените стил интернет мреже управљачем корисничких стилова. Stylus вам омогућава да лако инсталирате теме и скинове за многе популарне сајтове."
-	}
-}
+{
+	"appliesToEverything": {
+		"message": "Све",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "подразумевано",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Извези",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Проблеми",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
+	},
+	"cm_tabSize": {
+		"message": "Величина картице",
+		"description": "Label for the text box controlling tab size option for the style editor."
+	},
+	"enableStyleLabel": {
+		"message": "Омогући",
+		"description": "Label for the button to enable a style"
+	},
+	"styleMissingName": {
+		"message": "Унесите назив",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
+	},
+	"appliesDomainOption": {
+		"message": "УРЛ адресе на домену",
+		"description": "Option to make the style apply to the entered string as a domain"
+	},
+	"checkForUpdate": {
+		"message": "Проверите ажурирање",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Додај стилу",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
+	},
+	"updateAllCheckSucceededNoUpdate": {
+		"message": "Сви стилови су ажурирани.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Налепи код у Mozilla формату",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
+	},
+	"helpAlt": {
+		"message": "Помоћ",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Претражи",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Да",
+		"description": "'Yes' button in a confirm dialog"
+	},
+	"findStylesForSite": {
+		"message": "Пронађи још стилова за овај сајт",
+		"description": "Text for a link that gets a list of styles for the current site"
+	},
+	"manageHeading": {
+		"message": "Инсталирани стилови",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Улепшај",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
+	},
+	"styleEnabledLabel": {
+		"message": "Омогућено",
+		"description": "Label for the enabled state of styles"
+	},
+	"styleToMozillaFormatHelp": {
+		"message": "Mozilla формат кода се може користити у Stylish за Firefox и може се послати на userstyles.org.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
+	},
+	"sectionAdd": {
+		"message": "Додај нови одељак",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
+	},
+	"styleSaveLabel": {
+		"message": "Сачувај",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Заустави",
+		"description": "'Stop' button in a confirm dialog"
+	},
+	"writeStyleForURL": {
+		"message": "ову УРЛ адресу",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
+	},
+	"appliesAdd": {
+		"message": "Додај",
+		"description": "Label for the button to add an 'applies' entry"
+	},
+	"appliesRegexpOption": {
+		"message": "УРЛ адресе које одговарају регуларном изразу",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
+	},
+	"styleInstall": {
+		"message": "Инсталирати '$stylename$' у Stylus?",
+		"description": "Confirmation when installing a style",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Преузмите стилове са userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Помоћ</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Претражи садржај",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
+	"disableStyleLabel": {
+		"message": "Онемогући",
+		"description": "Label for the button to disable a style"
+	},
+	"prefShowBadge": {
+		"message": "Прикажи број активних стилова за тренутни сајт на дугмету на алатној траци",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "Прикажи број активних стилова",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+	},
+	"cm_lineWrapping": {
+		"message": "Преламање текста",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
+	},
+	"styleCancelEditLabel": {
+		"message": "Назад на управљање",
+		"description": "Label for cancel button for style editing"
+	},
+	"styleChangesNotSaved": {
+		"message": "Направили сте измене овог стила које нисте сачували.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Увези",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
+	},
+	"updateCheckFailServerUnreachable": {
+		"message": "Ажурирање није успело: сервер није доступан.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "Филтери",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "Примени сва ажурирања",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
+	},
+	"deleteStyleConfirm": {
+		"message": "Да ли сте сигурни да желите да избришете овај стил?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
+	},
+	"styleBadRegexp": {
+		"message": "Регуларни израз је неисправан.",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "Опције",
+		"description": "Heading for options section on manage page."
+	},
+	"appliesDisplay": {
+		"message": "Примењује се на: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
+		"placeholders": {
+			"applies": {
+				"content": "$1"
+			}
+		}
+	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
+	"styleUpdate": {
+		"message": "Да ли сте сигурни да желите да ажурирате '$stylename$'?",
+		"description": "Confirmation when updating a style",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
+	"styleSectionsTitle": {
+		"message": "Одељци",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
+	},
+	"editStyleTitle": {
+		"message": "Уреди стил $stylename$",
+		"description": "Title of the page for editing styles",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
+	"updateCheckSucceededNoUpdate": {
+		"message": "Стил је ажуриран.",
+		"description": "Text that displays when an update check completed and no update is available"
+	},
+	"appliesUrlPrefixOption": {
+		"message": "УРЛ адресе које почињу са",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Користи /re/ синтаксу за претрагу  регуларним изразом",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Одбаци садржај тренутног стила и упиши преко њега увезени стил",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
+	},
+	"popupStylesFirst": {
+		"message": "Излистај стилове пре команди у менију дугмета на алатној траци",
+		"description": "Label for the checkbox controlling section order in the popup."
+	},
+	"sectionHelp": {
+		"message": "Одељци вам омогућавају да дефинишете различите делове кода који се примењују на раличите скупове УРЛ-ова у истом стилу. На пример, један исти стил може променити почетну страницу једног сајта на један начин а остатак сајта на други начин.",
+		"description": "Help text for sections"
+	},
+	"noStylesForSite": {
+		"message": "Нема инсталираних стилова за овај сајт.",
+		"description": "Text displayed when no styles are installed for the current site"
+	},
+	"appliesDisplayTruncatedSuffix": {
+		"message": "и још",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
+	},
+	"appliesRemove": {
+		"message": "Уклони",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Стил у Mozilla формату",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "Упиши стил за:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Замени",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
+	},
+	"appliesLabel": {
+		"message": "Примењује се на",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
+	},
+	"openManage": {
+		"message": "Управљај инсталираним стиловима",
+		"description": "Link to open the manage page."
+	},
+	"updateCheckFailBadResponseCode": {
+		"message": "Ажурирање није успело: сервер је одговорио кодом $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
+		"placeholders": {
+			"code": {
+				"content": "$1"
+			}
+		}
+	},
+	"appliesSpecify": {
+		"message": "Детаљније",
+		"description": "Label for the button to make a style apply only to specific sites"
+	},
+	"installUpdate": {
+		"message": "Инсталирај ажурирање",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla формат",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
+	},
+	"sectionRemove": {
+		"message": "Уклони одељак",
+		"description": "Label for the button to remove a section"
+	},
+	"disableAllStyles": {
+		"message": "Искључи све стилове",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Опозови (свеобухватно)",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
+	},
+	"updateCompleted": {
+		"message": "Ажурирање је комплетирано.",
+		"description": "Text that displays when an update completed"
+	},
+	"checkingForUpdate": {
+		"message": "Проверавање...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
+	},
+	"sectionCode": {
+		"message": "Код",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "Користи паметно увлачење редова",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
+	},
+	"appliesHelp": {
+		"message": "Употреба 'Примењује се на' одређује опсег УРЛ адреса на које се код у овом одељку примењује.",
+		"description": "Help text for 'applies to' section"
+	},
+	"editStyleHeading": {
+		"message": "Уреди стил",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "УРЛ",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus не ради на страницама као што је ова.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
+	},
+	"addStyleTitle": {
+		"message": "Додај стил",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Упиши преко стила",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"dbError": {
+		"message": "Дошло је до грешке користећи Stylus базу података. Да ли желите да посетите веб страницу са могућим решењима?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Додај увезени стил тренутном стилу",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Притисни пречицу",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Замени све",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "Иди на ред (или line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"checkAllUpdates": {
+		"message": "Проверите ажурирања за све стилове",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "Проблем пронађен од стране <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> са овим омогућеним правилима:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "Не",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Опозови",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Мапа тастера",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "Користи картице са паметним увлачењем редова",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Замени са",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+	},
+	"deleteStyleLabel": {
+		"message": "Избриши",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
+	},
+	"addStyleLabel": {
+		"message": "Упиши нови стил",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "Само омогућени стилови",
+		"description": "Checkbox to show only enabled styles"
+	},
+	"editStyleLabel": {
+		"message": "Уреди",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Тема",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Укуцај име команде",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"description": {
+		"message": "Измените стил интернет мреже управљачем корисничких стилова. Stylus вам омогућава да лако инсталирате теме и скинове за многе популарне сајтове.",
+		"description": "Extension description"
+	}
+}
\ No newline at end of file
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index bb5ba747..fd56a903 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -1,109 +1,337 @@
 {
 	"appliesToEverything": {
-		"message": "Allt"
+		"message": "Allt",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "default",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Export",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Flikstorlek"
+		"message": "Flikstorlek",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Aktivera"
+		"message": "Aktivera",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Ange ett namn."
+		"message": "Ange ett namn.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "URL:er på domänen"
+		"message": "URL:er på domänen",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Leta efter uppdatering"
+		"message": "Leta efter uppdatering",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "Alla stilar är fullt uppdaterade."
+		"message": "Alla stilar är fullt uppdaterade.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Hjälp"
+		"message": "Hjälp",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Yes",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Hitta fler stilar för denna sida"
+		"message": "Hitta fler stilar för denna sida",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Installerade Stilar"
+		"message": "Installerade Stilar",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Aktiverad"
+		"message": "Aktiverad",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla-formatet av koden fungerar i Stylish till Firefox samt vid uppladdandet till userstyles.org."
+		"message": "Mozilla-formatet av koden fungerar i Stylish till Firefox samt vid uppladdandet till userstyles.org.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Lägg till ytterligare en sektion"
+		"message": "Lägg till ytterligare en sektion",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Spara"
+		"message": "Spara",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "denna URL"
+		"message": "denna URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Lägg till"
+		"message": "Lägg till",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "URL:er som matchar regexp:en"
+		"message": "URL:er som matchar regexp:en",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "Installera '$stylename$' in i Stylus?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "Inaktivera"
+		"message": "Inaktivera",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "Visa antalet aktiva stilar för den nuvarande sidan på verktygsfältsikonen"
+		"message": "Visa antalet aktiva stilar för den nuvarande sidan på verktygsfältsikonen",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "Visa antalet aktiva stilar"
+		"message": "Visa antalet aktiva stilar",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "Radbrytning"
+		"message": "Radbrytning",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Återgå till hantera"
+		"message": "Återgå till hantera",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Du har gjort ändringar i denna stil utan att spara."
+		"message": "Du har gjort ändringar i denna stil utan att spara.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Uppdateringen misslyckades: server onåbar."
+		"message": "Uppdateringen misslyckades: server onåbar.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "Filter"
+		"message": "Filter",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "Verkställ alla uppdateringar"
+		"message": "Verkställ alla uppdateringar",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Är du säker på att du vill ta bort denna stil?"
+		"message": "Är du säker på att du vill ta bort denna stil?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "Regexp:en är ogiltig"
+		"message": "Regexp:en är ogiltig",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "Alternativ"
+		"message": "Alternativ",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Gäller för: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
 	"styleUpdate": {
 		"message": "Är du säker på att du vill uppdatera '$stylename$'?",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -111,10 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "Sektioner"
+		"message": "Sektioner",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "Ändra i Stil $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -122,37 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Stilen är fullt uppdaterad."
+		"message": "Stilen är fullt uppdaterad.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "URL:er som börjar på"
+		"message": "URL:er som börjar på",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "Lista stilar före kommandon i verktygsfältets knappmeny"
+		"message": "Lista stilar före kommandon i verktygsfältets knappmeny",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Sektioner låter dig definiera olika sorters kod som påverkar olika URL:er i samma stil. Till exempel, en stil kan ändra en viss hemsida på ett sätt, samtidigt som den ändrar andra delar på en helt annan sida."
+		"message": "Sektioner låter dig definiera olika sorters kod som påverkar olika URL:er i samma stil. Till exempel, en stil kan ändra en viss hemsida på ett sätt, samtidigt som den ändrar andra delar på en helt annan sida.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Inga stilar installerade för denna sida."
+		"message": "Inga stilar installerade för denna sida.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "och mer"
+		"message": "och mer",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Ta bort"
+		"message": "Ta bort",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Tyylikäs",
+		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "Skriv stil för:"
+		"message": "Skriv stil för:",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Gäller för"
+		"message": "Gäller för",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Hantera installerade stilar"
+		"message": "Hantera installerade stilar",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Uppdateringen misslyckades: servern svarade med kod $code$.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -160,69 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Specificera"
+		"message": "Specificera",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Installera uppdatering"
+		"message": "Installera uppdatering",
+		"description": "Label for the button to install an update for a single style"
 	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus fungerar inte på sidor som denna."
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Ta bort sektion"
+		"message": "Ta bort sektion",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "Stäng av alla stilar"
+		"message": "Stäng av alla stilar",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Uppdatering slutförd."
+		"message": "Uppdatering slutförd.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Letar..."
+		"message": "Letar...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Kod"
+		"message": "Kod",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "Använd smart indrag"
+		"message": "Använd smart indrag",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Använd 'Gäller för' alternativet för att begränsa vilka URL:er koden i denna sektion gäller för."
+		"message": "Använd 'Gäller för' alternativet för att begränsa vilka URL:er koden i denna sektion gäller för.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Ändra i Stil"
+		"message": "Ändra i Stil",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus fungerar inte på sidor som denna.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Lägg till stil"
+		"message": "Lägg till stil",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "Ett fel inträffades vid hanteringen av Stylus-databasen. Skulle du vilja besöka en sida med eventuella lösningar?"
+		"message": "Ett fel inträffades vid hanteringen av Stylus-databasen. Skulle du vilja besöka en sida med eventuella lösningar?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "Gå till rad (eller rad:kol)"
+		"message": "Gå till rad (eller rad:kol)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Leta igenom alla stilar efter uppdateringar"
+		"message": "Leta igenom alla stilar efter uppdateringar",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
 	},
 	"cm_keyMap": {
-		"message": "Nyckelkarta"
+		"message": "Nyckelkarta",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "Använd flikar med smart indrag"
+		"message": "Använd flikar med smart indrag",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Ta bort"
+		"message": "Ta bort",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Skriv ny stil"
+		"message": "Skriv ny stil",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "Endast aktiverade stilar"
+		"message": "Endast aktiverade stilar",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Ändra"
+		"message": "Ändra",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Type a command name",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Style:a om webben med Stylus, en användarstils-hanterare. Stylus låter dig enkelt installera teman och skal för många populära sidor."
+		"message": "Style:a om webben med Stylus, en användarstils-hanterare. Stylus låter dig enkelt installera teman och skal för många populära sidor.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index 0646679c..dd93888f 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -1,82 +1,354 @@
 {
 	"appliesToEverything": {
-		"message": "Her şey"
+		"message": "Her şey",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "default",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Export",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
+	},
+	"cm_tabSize": {
+		"message": "Tab size",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "Etkinleştir"
+		"message": "Etkinleştir",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "Bir ad girin."
+		"message": "Bir ad girin.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "Alan adındaki URLler"
+		"message": "Alan adındaki URLler",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "Güncellemeleri denetle"
+		"message": "Güncellemeleri denetle",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
+	},
+	"updateAllCheckSucceededNoUpdate": {
+		"message": "No updates found.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "Yardım"
+		"message": "Yardım",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Yes",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "Bu site için başka stiller bul"
+		"message": "Bu site için başka stiller bul",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "Yüklü Stiller"
+		"message": "Yüklü Stiller",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "Etkin"
+		"message": "Etkin",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Kodun Mozilla biçimi, Firefox için Stylish ile kullanılabilir ve userstyles.org sitesine gönderilebilir."
+		"message": "Kodun Mozilla biçimi, Firefox için Stylish ile kullanılabilir ve userstyles.org sitesine gönderilebilir.",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "Başka bölüm ekle"
+		"message": "Başka bölüm ekle",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "Kaydet"
+		"message": "Kaydet",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
+	},
+	"writeStyleForURL": {
+		"message": "this URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "Ekleyin"
+		"message": "Ekleyin",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "regexp ile eşleşen URL'ler"
+		"message": "regexp ile eşleşen URL'ler",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "'$stylename$' Stylus'e yüklensin mi?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "Devre dışı bırak"
+		"message": "Devre dışı bırak",
+		"description": "Label for the button to disable a style"
+	},
+	"prefShowBadge": {
+		"message": "Number of styles active for the current site",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "Show active style count",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+	},
+	"cm_lineWrapping": {
+		"message": "Word wrap",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "Yönetim sayfasına dön"
+		"message": "Yönetim sayfasına dön",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "Bu stilde yaptığınız, kaydedilmemiş değişiklikler var."
+		"message": "Bu stilde yaptığınız, kaydedilmemiş değişiklikler var.",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "Güncellenemedi: sunucuya erişilemiyor."
+		"message": "Güncellenemedi: sunucuya erişilemiyor.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "Filters",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "Apply all updates",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "Bu stili silmek istediğinizden emin misiniz?"
+		"message": "Bu stili silmek istediğinizden emin misiniz?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
+	},
+	"styleBadRegexp": {
+		"message": "Regexp is invalid.",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "Options",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "Şuraya uygulanır: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
+	"styleUpdate": {
+		"message": "Are you sure you want to update '$stylename$'?",
+		"description": "Confirmation when updating a style",
+		"placeholders": {
+			"stylename": {
+				"content": "$1"
+			}
+		}
+	},
 	"styleSectionsTitle": {
-		"message": "Bölümler"
+		"message": "Bölümler",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "$stylename$ Stilini Düzenleyin",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -84,31 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "Stil güncel."
+		"message": "Stil güncel.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "Şununla başlayan URL'ler:"
+		"message": "Şununla başlayan URL'ler:",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
+	},
+	"popupStylesFirst": {
+		"message": "Styles before commands",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "Bölümler, aynı stil içindeki farklı URL kümelerine uygulanacak farklı kod parçaları tanımlamanıza olanak sağlar. Örneğin, tek bir stil bir sitenin ana sayfasını belirli bir şekilde değiştirirken, sayfanın kalan kısmını farklı bir şekilde değiştirebilir."
+		"message": "Bölümler, aynı stil içindeki farklı URL kümelerine uygulanacak farklı kod parçaları tanımlamanıza olanak sağlar. Örneğin, tek bir stil bir sitenin ana sayfasını belirli bir şekilde değiştirirken, sayfanın kalan kısmını farklı bir şekilde değiştirebilir.",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "Bu site için hiçbir stil yüklenmedi."
+		"message": "Bu site için hiçbir stil yüklenmedi.",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "ve diğerleri"
+		"message": "ve diğerleri",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "Kaldır"
+		"message": "Kaldır",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "Write style for: ",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "Şuraya uygulanır"
+		"message": "Şuraya uygulanır",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "Yüklü stilleri yönet"
+		"message": "Yüklü stilleri yönet",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "Güncellenemedi: sunucu yanıt olarak $code$ kodunu gönderdi.",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -116,45 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "Belirt"
+		"message": "Belirt",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "Güncellemeyi yükle"
+		"message": "Güncellemeyi yükle",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "Bölümü kaldır"
+		"message": "Bölümü kaldır",
+		"description": "Label for the button to remove a section"
+	},
+	"disableAllStyles": {
+		"message": "Turn all styles off",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "Güncelleme tamamlandı."
+		"message": "Güncelleme tamamlandı.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "Kontrol ediliyor..."
+		"message": "Kontrol ediliyor...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "Kod"
+		"message": "Kod",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "Use smart indentation",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "Bu bölümdeki kodun hangi URLlere uygulanacağını sınırlamak için 'Şuraya uygulanır' denetimlerini kullanın."
+		"message": "Bu bölümdeki kodun hangi URLlere uygulanacağını sınırlamak için 'Şuraya uygulanır' denetimlerini kullanın.",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "Stili Düzenle"
+		"message": "Stili Düzenle",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
+	},
+	"appliesUrlOption": {
+		"message": "URL",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus doesn't work on pages like this.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "Stil Ekleyin"
+		"message": "Stil Ekleyin",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"dbError": {
+		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "Goto line (or line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "Tüm stiller için güncellemeleri denetle"
+		"message": "Tüm stiller için güncellemeleri denetle",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Keymap",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "Use tabs with smart indentation",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "Sil"
+		"message": "Sil",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "Yeni stil oluşturun"
+		"message": "Yeni stil oluşturun",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "Only enabled styles",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "Düzenle"
+		"message": "Düzenle",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Type a command name",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Kullanıcı stil yöneticisi Stylus ile Web'in stilini yenileyin. Stylus Google, Facebook, YouTube, Orkut ve diğer pek çok site için temalar ve görünüm yüklemenize imkân tanır."
+		"message": "Kullanıcı stil yöneticisi Stylus ile Web'in stilini yenileyin. Stylus Google, Facebook, YouTube, Orkut ve diğer pek çok site için temalar ve görünüm yüklemenize imkân tanır.",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/zh/messages.json b/_locales/zh/messages.json
index 77c1fb1e..fe54f6a6 100644
--- a/_locales/zh/messages.json
+++ b/_locales/zh/messages.json
@@ -1,79 +1,337 @@
 {
 	"appliesToEverything": {
-		"message": "所有站点"
+		"message": "所有站点",
+		"description": "Text displayed for styles that apply to all sites"
+	},
+	"defaultTheme": {
+		"message": "default",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "List of matching opened tabs (click on URL to focus its tab)",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "Export styles",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "Automatically check for and install all available userstyle updates (in hrs)",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
+	},
+	"exportLabel": {
+		"message": "Export",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
+	},
+	"issues": {
+		"message": "Issues",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "Background color",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "History of update checks",
+		"description": ""
+	},
+	"cm_tabSize": {
+		"message": "Tab size",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "启用"
+		"message": "启用",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "请输入名称."
+		"message": "请输入名称.",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "History",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "Define keyboard shortcuts",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "指定域上的URL"
+		"message": "指定域上的URL",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "检查更新"
+		"message": "检查更新",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "Some 'regexp()' rules that could not be compiled at all.",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "Dark browser themes",
+		"description": ""
+	},
+	"importAppendLabel": {
+		"message": "Append to style",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "Manage styles",
+		"description": ""
+	},
+	"updateAllCheckSucceededNoUpdate": {
+		"message": "No updates found.",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "added",
+		"description": "Text after the number of styles added in the report shown after importing styles"
+	},
+	"styleFromMozillaFormatPrompt": {
+		"message": "Paste the Mozilla-format code",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "Drop your backup file anywhere on this page to import.",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "帮助"
+		"message": "帮助",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "OK",
+		"description": ""
+	},
+	"search": {
+		"message": "Search",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "Grayed out",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
+	},
+	"confirmYes": {
+		"message": "Yes",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "查找更多适合此站点的样式"
+		"message": "查找更多适合此站点的样式",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "已安装的样式"
+		"message": "已安装的样式",
+		"description": "Heading for the manage page"
+	},
+	"styleBeautify": {
+		"message": "Beautify",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "已启用"
+		"message": "已启用",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "用于Firefox上的Stylish的Mozilla格式样式代码可以在 userstyles.org 上提交"
+		"message": "用于Firefox上的Stylish的Mozilla格式样式代码可以在 userstyles.org 上提交",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "添加新节"
+		"message": "添加新节",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "Not matching fully, hence skipped",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "保存"
+		"message": "保存",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "Delete",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "Cancel",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "Import styles",
+		"description": ""
+	},
+	"confirmStop": {
+		"message": "Stop",
+		"description": "'Stop' button in a confirm dialog"
+	},
+	"writeStyleForURL": {
+		"message": "this URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "More Options",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "添加"
+		"message": "添加",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "匹配正则的URL"
+		"message": "匹配正则的URL",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "updated code",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "安装 '$stylename$' 到 Stylus?",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "Background color when disabled",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "Update styles",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "Only locally created styles",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
+	"searchStyles": {
+		"message": "Search contents",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "Check again, I didn't edit any styles!",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
+		"description": "Note in the toolbar popup for file:// URLs"
+	},
 	"disableStyleLabel": {
-		"message": "禁用"
+		"message": "禁用",
+		"description": "Label for the button to disable a style"
+	},
+	"prefShowBadge": {
+		"message": "Number of styles active for the current site",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons in applies-to column",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"menuShowBadge": {
+		"message": "Show active style count",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
+	},
+	"cm_lineWrapping": {
+		"message": "Word wrap",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "返回到管理"
+		"message": "返回到管理",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "您已经修改了此样式，但尚未保存"
+		"message": "您已经修改了此样式，但尚未保存",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
+	},
+	"importLabel": {
+		"message": "Import",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "Shortcuts",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失败: 服务器无法访问."
+		"message": "更新失败: 服务器无法访问.",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
+	},
+	"manageFilters": {
+		"message": "Filters",
+		"description": "Label for filters container"
+	},
+	"applyAllUpdates": {
+		"message": "Apply all updates",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "Reset the options to default values",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "Updates",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "确定要删除这个样式吗?"
+		"message": "确定要删除这个样式吗?",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "Popup",
+		"description": ""
+	},
+	"styleBadRegexp": {
+		"message": "Regexp is invalid.",
+		"description": "Validation message for a bad regexp in a style"
+	},
+	"optionsHeading": {
+		"message": "Options",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "应用到: $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "Light browser themes",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "Open styles manager",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
 	"styleUpdate": {
 		"message": "你確定要更新 '$stylename$' 嗎？",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -81,10 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "样式节"
+		"message": "样式节",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "invalid skipped",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "编辑样式 $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -92,31 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "已经是最新的."
+		"message": "已经是最新的.",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "以指定地址开始"
+		"message": "以指定地址开始",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "Token under cursor",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
+	},
+	"searchRegexp": {
+		"message": "Use /re/ syntax for regexp search",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "Forcing an update will overwrite any local edits.",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "Toggle style",
+		"description": "Label for the checkbox to enable/disable a style"
+	},
+	"importReplaceTooltip": {
+		"message": "Discard contents of current style and overwrite it with the imported style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "Double-click to maximize/restore the height",
+		"description": "Tooltip for the resize grip in style editor"
+	},
+	"popupStylesFirst": {
+		"message": "Styles before commands",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "样式节允许你定义多个样式段落并将它们应用于不同的站点匹配规则上。例如，一个样式可以更改使用一个方式来更改主页，而此时其它的样式段可以更改站点的其它部分。"
+		"message": "样式节允许你定义多个样式段落并将它们应用于不同的站点匹配规则上。例如，一个样式可以更改使用一个方式来更改主页，而此时其它的样式段可以更改站点的其它部分。",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "当前站点上没有已安装的样式"
+		"message": "当前站点上没有已安装的样式",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "以及更多"
+		"message": "以及更多",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "移除"
+		"message": "移除",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "Updates installed:",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
+	},
+	"styleToMozillaFormatTitle": {
+		"message": "Style in Mozilla format",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
+	},
+	"writeStyleFor": {
+		"message": "Write style for: ",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
+	},
+	"replace": {
+		"message": "Replace",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "No matching tabs",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "updated meta info",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "应用到"
+		"message": "应用到",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "Options",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "管理已安装样式"
+		"message": "管理已安装样式",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "更新失败: 服务器了返回代码 $code$。",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -124,48 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "指定站点"
+		"message": "指定站点",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "安装更新"
+		"message": "安装更新",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "Check for and install all available updates",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "Finished importing styles",
+		"description": "Title of the report shown after importing styles"
+	},
+	"styleMozillaFormatHeading": {
+		"message": "Mozilla Format",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
+	},
+	"cm_matchHighlight": {
+		"message": "Highlight",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "Indent @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "Could not communicate with the page. Try reloading the tab.",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "移除节"
+		"message": "移除节",
+		"description": "Label for the button to remove a section"
+	},
+	"disableAllStyles": {
+		"message": "Turn all styles off",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "This style might have been edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
+	},
+	"undoGlobal": {
+		"message": "Undo in all sections",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "Toolbar icon",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "更新完成."
+		"message": "更新完成.",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "检查中..."
+		"message": "检查中...",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "Matching tabs",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "Number of applies-to items",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "This style was edited locally.",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "Reset options",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "代码"
+		"message": "代码",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "Add 'Delete' in editor context menu",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "updated both meta info and code",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
+	},
+	"cm_smartIndent": {
+		"message": "Use smart indentation",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "RegExp test",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "使用“应用到”来控制这个样式应用到哪些地址上。"
+		"message": "使用“应用到”来控制这个样式应用到哪些地址上。",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "编辑样式"
+		"message": "编辑样式",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "Delete",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "Autocomplete on typing",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "Selection only",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
 	"appliesUrlOption": {
-		"message": "地址"
+		"message": "地址",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus doesn't work on pages like this.",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "Only with updates or issues",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "添加样式"
+		"message": "添加样式",
+		"description": "Title of the page for adding styles"
+	},
+	"importReplaceLabel": {
+		"message": "Overwrite style",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"dbError": {
+		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "Advanced",
+		"description": ""
+	},
+	"importAppendTooltip": {
+		"message": "Append the imported style to current style",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "Find editor styles",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "Open",
+		"description": ""
+	},
+	"helpKeyMapHotkey": {
+		"message": "Press a hotkey",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "Invalid regexps skipped",
+		"description": "RegExp test report: label for the invalid expressions"
+	},
+	"replaceAll": {
+		"message": "Replace all",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "Nothing was changed.",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "Actions",
+		"description": ""
+	},
+	"editGotoLine": {
+		"message": "Goto line (or line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "(the styles not installed through a userstyles.org page)",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "检查所有样式的更新"
+		"message": "检查所有样式的更新",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "Options UI",
+		"description": "Go to Options UI"
+	},
+	"issuesHelp": {
+		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "Badge on the toolbar icon",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "identical skipped",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "Popup width (in pixels)",
+		"description": ""
+	},
+	"confirmNo": {
+		"message": "No",
+		"description": "'No' button in a confirm dialog"
+	},
+	"undo": {
+		"message": "Undo",
+		"description": "Button label"
+	},
+	"cm_keyMap": {
+		"message": "Keymap",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "New manage UI layout",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "Import has been undone",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "Disabled",
+		"description": "Used in various lists/options to indicate that something is disabled"
+	},
+	"cm_indentWithTabs": {
+		"message": "Use tabs with smart indentation",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
+	},
+	"replaceWith": {
+		"message": "Replace with",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "删除"
+		"message": "删除",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "Install update (local edits will be overwritten)",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "Expose iframes via HTML[stylus-iframe]",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "编写新的样式"
+		"message": "编写新的样式",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "To disable the automatic userstyle update checks, set interval to 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "Backup",
+		"description": "Heading for backup"
+	},
+	"manageOnlyEnabled": {
+		"message": "Only enabled styles",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "编辑"
+		"message": "编辑",
+		"description": "Label for the button to go to the edit style page"
+	},
+	"cm_theme": {
+		"message": "Theme",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "Select a file or drag and drop to this page.",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "styles were reverted",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
+	},
+	"helpKeyMapCommand": {
+		"message": "Type a command name",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Stylus，一个用户样式管理器，帮助您重新定义网页样式。Stylus易于为Google，Facebook，Youtube，Orkut以及其它各类型网站安装样式和主题。"
+		"message": "Stylus，一个用户样式管理器，帮助您重新定义网页样式。Stylus易于为Google，Facebook，Youtube，Orkut以及其它各类型网站安装样式和主题。",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index c5b7e3e1..fc8d7041 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -1,150 +1,207 @@
 {
 	"appliesToEverything": {
-		"message": "全部"
+		"message": "全部",
+		"description": "Text displayed for styles that apply to all sites"
 	},
 	"defaultTheme": {
-		"message": "默认"
+		"message": "默认",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
 	},
 	"styleRegexpTestTitle": {
-		"message": "列出当前正则表达式匹配的网页标签（点击网址 URL 可跳转到该页）"
+		"message": "列出当前正则表达式匹配的网页标签（点击网址 URL 可跳转到该页）",
+		"description": "RegExp test report: title of the report"
 	},
 	"bckpInstStyles": {
-		"message": "导出所有样式"
+		"message": "导出所有样式",
+		"description": ""
 	},
 	"optionsUpdateInterval": {
-		"message": "每 N 小时，检查所有样式更新（0 为关闭检查）"
+		"message": "每 N 小时，检查所有样式更新（0 为关闭检查）",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "按 Alt + Enter 切换启用/禁用状态并保存样式",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
 	},
 	"exportLabel": {
-		"message": "导出"
+		"message": "导出",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
 	"issues": {
-		"message": "问题"
+		"message": "问题",
+		"description": "Label for the CSSLint issues block on the style edit page"
 	},
 	"optionsBadgeNormal": {
-		"message": "背景颜色"
+		"message": "背景颜色",
+		"description": ""
 	},
 	"updateCheckHistory": {
-		"message": "检测升级的历史记录"
+		"message": "检测升级的历史记录",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "标签尺寸"
+		"message": "标签尺寸",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "启用"
+		"message": "启用",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "输入名称。"
+		"message": "输入名称。",
+		"description": "Error displayed when user saves without providing a name"
 	},
 	"genericHistoryLabel": {
-		"message": "历史"
+		"message": "历史",
+		"description": "Used in various places to show a history log of something"
 	},
 	"shortcutsNote": {
-		"message": "定义键盘快捷键"
+		"message": "定义键盘快捷键",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "该域上的网址"
+		"message": "该域上的网址",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "检查更新"
+		"message": "检查更新",
+		"description": "Label for the button to check a single style for an update"
 	},
 	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "正则表达式错误，样式无法正常运行"
+		"message": "正则表达式错误，样式无法正常运行",
+		"description": "Tooltip in the popup for styles that were not applied at all"
 	},
 	"styleRegexpInvalidExplanation": {
-		"message": "部分正则表达式无法生效。"
+		"message": "部分正则表达式无法生效。",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "暗色浏览器主题",
+		"description": ""
 	},
 	"importAppendLabel": {
-		"message": "追加到样式"
+		"message": "追加到样式",
+		"description": "Label for the button to import a style and append to the existing sections"
 	},
 	"optionsOpenManager": {
-		"message": "管理样式"
+		"message": "管理样式",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "没找到任何升级。"
+		"message": "没找到任何升级。",
+		"description": "Text that displays when an update all check completed and no updates are available"
 	},
 	"importReportLegendAdded": {
-		"message": "个样式已添加"
+		"message": "个样式已添加",
+		"description": "Text after the number of styles added in the report shown after importing styles"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "粘贴 Mozilla 格式代码"
+		"message": "粘贴 Mozilla 格式代码",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
 	},
 	"dragDropMessage": {
-		"message": "把 json 备份文件拖放到页面的任意位置，即可导入数据库"
+		"message": "把 json 备份文件拖放到页面的任意位置，即可导入数据库",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "帮助"
+		"message": "帮助",
+		"description": "Alternate text for help buttons"
 	},
 	"confirmOK": {
-		"message": "确认"
+		"message": "确认",
+		"description": ""
 	},
 	"search": {
-		"message": "搜索"
+		"message": "搜索",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
 	},
 	"manageFaviconsGray": {
-		"message": "灰色图标"
+		"message": "灰色图标",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
 	},
 	"confirmYes": {
-		"message": "是"
+		"message": "是",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "查找适合此网站的更多样式"
+		"message": "查找适合此网站的更多样式",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "已安装的样式"
+		"message": "已安装的样式",
+		"description": "Heading for the manage page"
 	},
 	"styleBeautify": {
-		"message": "美化"
+		"message": "美化",
+		"description": "Label for the CSS-beautifier button on the edit style page"
 	},
 	"styleRegexpProblemTooltip": {
-		"message": "多个部分代码无法正常处理正则表达式"
+		"message": "多个部分代码无法正常处理正则表达式",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "已启用"
+		"message": "已启用",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "FireFox(Mozilla) 格式的 CSS 代码导入后，会自动转换成适 Stylus 使用的 Chrome 格式的 CSS 代码。反过来，Chrome 格式的 CSS 也可以导出为适合 FireFox 使用的格式。需要注意的是，如果你要提交你的 CSS 代码到 userstyles.org，则必须使用 FireFox(Mozilla) 格式的 CSS 代码。"
+		"message": "FireFox(Mozilla) 格式的 CSS 代码导入后，会自动转换成适 Stylus 使用的 Chrome 格式的 CSS 代码。反过来，Chrome 格式的 CSS 也可以导出为适合 FireFox 使用的格式。需要注意的是，如果你要提交你的 CSS 代码到 userstyles.org，则必须使用 FireFox(Mozilla) 格式的 CSS 代码。",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "添加其他部分"
+		"message": "添加其他部分",
+		"description": "Label for the button to add a section"
 	},
 	"styleRegexpTestPartial": {
-		"message": "没有完全匹配，因此忽略"
+		"message": "没有完全匹配，因此忽略",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "保存"
+		"message": "保存",
+		"description": "Label for save button for style editing"
 	},
 	"confirmDelete": {
-		"message": "删除"
+		"message": "删除",
+		"description": ""
 	},
 	"confirmCancel": {
-		"message": "取消"
+		"message": "取消",
+		"description": ""
 	},
 	"retrieveBckp": {
-		"message": "导入所有样式"
+		"message": "导入所有样式",
+		"description": ""
 	},
 	"confirmStop": {
-		"message": "停止"
+		"message": "停止",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "这个URL"
+		"message": "这个URL",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
 	"optionsSubheading": {
-		"message": "附加选项"
+		"message": "附加选项",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "添加"
+		"message": "添加",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "与该正则表达式匹配的网址"
+		"message": "与该正则表达式匹配的网址",
+		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
 	"optionsAdvancedExposeIframesNote": {
-		"message": "在开发者工具中，找到 Stylus 特定插入的框架代码，以便调用，例如：“html[stylus-iframe] h1 { display:none }”"
+		"message": "在开发者工具中，找到 Stylus 特定插入的框架代码，以便调用，例如：“html[stylus-iframe] h1 { display:none }”",
+		"description": ""
 	},
 	"importReportLegendUpdatedCode": {
-		"message": "代码已更新"
+		"message": "代码已更新",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "要将“$stylename$”安装到 Stylus 中吗？",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -152,96 +209,129 @@
 		}
 	},
 	"optionsBadgeDisabled": {
-		"message": "关闭时的背景颜色"
+		"message": "关闭时的背景颜色",
+		"description": ""
 	},
 	"optionsCheck": {
-		"message": "升级样式"
+		"message": "升级样式",
+		"description": ""
 	},
 	"manageText": {
-		"message": "<a href='https://userstyles.org'>从 userstyles.org 获取样式</a> | <a href='http://add0n.com/stylus.html'>帮助</a>"
+		"message": "<a href='https://userstyles.org'>从 userstyles.org 获取样式</a> | <a href='http://add0n.com/stylus.html'>帮助</a>",
+		"description": "Help text on the manage page"
 	},
 	"manageOnlyLocal": {
-		"message": "只显示在本地创建的样式"
+		"message": "只显示在本地创建的样式",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"searchStyles": {
-		"message": "搜索内容"
+		"message": "搜索内容",
+		"description": "Label for the search filter textbox on the Manage styles page"
 	},
 	"optionsUpdateImportNote": {
-		"message": "从旧版本的 Stylus 或 Stylish 中导入样式备份时，请在样式管理器中手动检测升级一次，以确保所有样式都可更新到最新版本。"
+		"message": "从旧版本的 Stylus 或 Stylish 中导入样式备份时，请在样式管理器中手动检测升级一次，以确保所有样式都可更新到最新版本。",
+		"description": ""
 	},
 	"checkAllUpdatesForce": {
-		"message": "再检测一次，我没有修改过任何样式。"
+		"message": "再检测一次，我没有修改过任何样式。",
+		"description": "Label for the button to apply all detected updates"
 	},
 	"unreachableFileHint": {
-		"message": "如果需要改变 file:// 协议的样式，则需要在 chrome://extensions 页面中的 Stylus 扩展选项里面，打开 允许访问文件网址 的权限"
+		"message": "如果需要改变 file:// 协议的样式，则需要在 chrome://extensions 页面中的 Stylus 扩展选项里面，打开 允许访问文件网址 的权限",
+		"description": "Note in the toolbar popup for file:// URLs"
 	},
 	"disableStyleLabel": {
-		"message": "停用"
+		"message": "停用",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "当前网站激活的样式数量"
+		"message": "当前网站激活的样式数量",
+		"description": "Label for the checkbox controlling toolbar badge text."
 	},
 	"manageFavicons": {
-		"message": "显示应用对象的图标"
+		"message": "显示应用对象的图标",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "显示生效的样式计数"
+		"message": "显示生效的样式计数",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "自动换行"
+		"message": "自动换行",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "返回进行管理操作"
+		"message": "返回进行管理操作",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "您已对此样式进行了更改，但尚未保存。"
+		"message": "您已对此样式进行了更改，但尚未保存。",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
 	"importLabel": {
-		"message": "导入"
+		"message": "导入",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
 	"shortcuts": {
-		"message": "快捷键"
+		"message": "快捷键",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失败: 无法访问服务器。"
+		"message": "更新失败: 无法访问服务器。",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "过滤器"
+		"message": "过滤器",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "应用全部更新"
+		"message": "应用全部更新",
+		"description": "Label for the button to apply all detected updates"
 	},
 	"optionsReset": {
-		"message": "重置所有选项为默认值"
+		"message": "重置所有选项为默认值",
+		"description": ""
 	},
 	"optionsCustomizeUpdate": {
-		"message": "检测升级"
+		"message": "检测升级",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "确定要删除此样式吗？"
+		"message": "确定要删除此样式吗？",
+		"description": "Confirmation before deleting a style"
 	},
 	"optionsCustomizePopup": {
-		"message": "样式管理弹框"
+		"message": "样式管理弹框",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "正则表达式无效。"
+		"message": "正则表达式无效。",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "选项"
+		"message": "选项",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "应用对象：$applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "亮色浏览器主题",
+		"description": ""
+	},
 	"openStylesManager": {
-		"message": "打开样式管理器"
+		"message": "打开样式管理器",
+		"description": "Label for the style maanger opener in the browser action context menu."
 	},
 	"styleUpdate": {
 		"message": "您确定要更新 '$stylename$'?",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -249,13 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "部分"
+		"message": "部分",
+		"description": "Title for the style sections section"
 	},
 	"importReportLegendInvalid": {
-		"message": "忽略无效的代码"
+		"message": "忽略无效的代码",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "修改样式“$stylename$”",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -263,70 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "样式已是最新版本。"
+		"message": "样式已是最新版本。",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "网址前缀"
+		"message": "网址前缀",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
 	"cm_matchHighlightToken": {
-		"message": "光标所在的位置"
+		"message": "光标所在的位置",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
 	},
 	"searchRegexp": {
-		"message": "使用 /re/ 语法进行正则表达式搜索"
+		"message": "使用 /re/ 语法进行正则表达式搜索",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
 	},
 	"updateCheckManualUpdateHint": {
-		"message": "强制升级将覆盖所有本地修改的样式"
+		"message": "强制升级将覆盖所有本地修改的样式",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"toggleStyle": {
-		"message": "切换样式"
+		"message": "切换样式",
+		"description": "Label for the checkbox to enable/disable a style"
 	},
 	"importReplaceTooltip": {
-		"message": "放弃当前样式的内容，使用已导入样式覆盖它"
+		"message": "放弃当前样式的内容，使用已导入样式覆盖它",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "双击来最大化/恢复高度",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "样式列表置顶"
+		"message": "样式列表置顶",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "各部分可让您定义不同的代码段，以通过同一样式应用到不同的网址组。例如，某个单一样式能以一种方式更改网站首页，同时以另一种方式更改网站的其余部分。"
+		"message": "各部分可让您定义不同的代码段，以通过同一样式应用到不同的网址组。例如，某个单一样式能以一种方式更改网站首页，同时以另一种方式更改网站的其余部分。",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "未对此网站安装任何样式。"
+		"message": "未对此网站安装任何样式。",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "等等"
+		"message": "等等",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "删除"
+		"message": "删除",
+		"description": "Label for the button to remove an 'applies' entry"
 	},
 	"updatesCurrentlyInstalled": {
-		"message": "更新已安装"
+		"message": "更新已安装",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Mozilla 格式的样式"
+		"message": "Mozilla 格式的样式",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "编写样式给："
+		"message": "编写样式给：",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
 	"replace": {
-		"message": "替换"
+		"message": "替换",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
 	},
 	"styleRegexpTestNone": {
-		"message": "没有发现任何网页标签与正则表达式匹配"
+		"message": "没有发现任何网页标签与正则表达式匹配",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
 	},
 	"importReportLegendUpdatedMeta": {
-		"message": "升级信息"
+		"message": "升级信息",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "应用对象："
+		"message": "应用对象：",
+		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
 	"openOptionsPopup": {
-		"message": "设置用户界面"
+		"message": "设置用户界面",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "管理已安装的样式"
+		"message": "管理已安装的样式",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "更新失败: 服务器响应代码为 $code$。",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -334,222 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "指定"
+		"message": "指定",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "安装更新"
+		"message": "安装更新",
+		"description": "Label for the button to install an update for a single style"
 	},
 	"optionsCheckUpdate": {
-		"message": "检查所有样式更新"
+		"message": "检查所有样式更新",
+		"description": ""
 	},
 	"importReportTitle": {
-		"message": "样式导入完成"
+		"message": "样式导入完成",
+		"description": "Title of the report shown after importing styles"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla 格式"
+		"message": "Mozilla 格式",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
 	"cm_matchHighlight": {
-		"message": "高亮"
+		"message": "高亮",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
 	},
 	"styleRegexpPartialExplanation": {
-		"message": "这个样式有一部分正则表达式与 <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a>完整的 URL 不匹配。这部分样式将被忽略，可能这个样式是基于 Stylish 编写的，请尝试在 Stylus 重新编写该样式。"
+		"message": "这个样式有一部分正则表达式与 <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a>完整的 URL 不匹配。这部分样式将被忽略，可能这个样式是基于 Stylish 编写的，请尝试在 Stylus 重新编写该样式。",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "缩进 @media、@supports",
+		"description": "CSS-beautifier option"
 	},
 	"unreachableContentScript": {
-		"message": "无法读取页面，请尝试刷新。"
+		"message": "无法读取页面，请尝试刷新。",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "删除此部分"
+		"message": "删除此部分",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "停用所有样式"
+		"message": "停用所有样式",
+		"description": "Label for the checkbox that turns all enabled styles off."
 	},
 	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "这个样式可能在本地修改过，如果强制升级更新则会覆盖修改的内容。"
+		"message": "这个样式可能在本地修改过，如果强制升级更新则会覆盖修改的内容。",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
 	},
 	"undoGlobal": {
-		"message": "撤销 (全局)"
+		"message": "撤销 (全局)",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "切换图标",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "更新已完成。"
+		"message": "更新已完成。",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "正在检查更新..."
+		"message": "正在检查更新...",
+		"description": "Text to display when checking a style for an update"
 	},
 	"styleRegexpTestFull": {
-		"message": "匹配的网页标签"
+		"message": "匹配的网页标签",
+		"description": "RegExp test report: label for the fully matching expressions"
 	},
 	"manageMaxTargets": {
-		"message": "应用对象的数量"
+		"message": "应用对象的数量",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
 	},
 	"manageFaviconsHelp": {
-		"message": "Stylus 使用了 https://www.google.com/s2/favicons?domain=http://add0n.com/stylus.html 方式获取图标"
+		"message": "Stylus 使用了 https://www.google.com/s2/favicons?domain=http://add0n.com/stylus.html 方式获取图标",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"updateCheckSkippedLocallyEdited": {
-		"message": "此样式已在本地修改过。"
+		"message": "此样式已在本地修改过。",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsResetButton": {
-		"message": "恢复默认值"
+		"message": "恢复默认值",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "代码"
+		"message": "代码",
+		"description": "Label for the code for a section"
 	},
 	"optionsAdvancedContextDelete": {
-		"message": "添加“删除”到编辑器的菜单"
+		"message": "添加“删除”到编辑器的菜单",
+		"description": ""
 	},
 	"importReportLegendUpdatedBoth": {
-		"message": "已更新的所有信息和代码"
+		"message": "已更新的所有信息和代码",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "启用智能缩进"
+		"message": "启用智能缩进",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
 	"styleRegexpTestButton": {
-		"message": "测试正则表达式"
+		"message": "测试正则表达式",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "使用“应用对象”控件来限制此部分中的代码所应用到的网址。"
+		"message": "使用“应用对象”控件来限制此部分中的代码所应用到的网址。",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "修改样式"
+		"message": "修改样式",
+		"description": "Title of the page for editing styles"
 	},
 	"editDeleteText": {
-		"message": "删除"
+		"message": "删除",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "输入时自动完成",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "出于安全原因，浏览器禁止扩展影响内置页面（例如 chrome://version 或 about:addons）以及其他扩展的页面。各浏览器同时也限制介入自己的扩展网站（如 Chrome 网上应用店、Firefox 附加组件）。",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
 	"cm_matchHighlightSelection": {
-		"message": "选择区域"
+		"message": "选择区域",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
 	"appliesUrlOption": {
-		"message": "网址"
+		"message": "网址",
+		"description": "Option to make the style apply to the entered string as a URL"
 	},
 	"updateAllCheckSucceededSomeEdited": {
-		"message": "如果你修改过一些样式，那它们可能被忽略更新，你可以单独检测这些样式强制升级，也可以点 再次检测所有样式强制更新。"
+		"message": "如果你修改过一些样式，那它们可能被忽略更新，你可以单独检测这些样式强制升级，也可以点 再次检测所有样式强制更新。",
+		"description": "Text that displays when an update all check completed and no updates are available"
 	},
 	"stylusUnavailableForURL": {
-		"message": "Stylus 在这样的页面上不工作"
+		"message": "Stylus 在这样的页面上不工作",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
 	"manageOnlyUpdates": {
-		"message": "只显示可升级的样式"
+		"message": "只显示可升级的样式",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "添加样式"
+		"message": "添加样式",
+		"description": "Title of the page for adding styles"
 	},
 	"importReplaceLabel": {
-		"message": "覆盖样式"
+		"message": "覆盖样式",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "应用Stylus数据库时发生了一个错误。您想要访问包含可能的解决方案的网页吗？"
+		"message": "应用Stylus数据库时发生了一个错误。您想要访问包含可能的解决方案的网页吗？",
+		"description": "Prompt when a DB error is encountered"
 	},
 	"optionsAdvanced": {
-		"message": "高级设置"
+		"message": "高级设置",
+		"description": ""
 	},
 	"importAppendTooltip": {
-		"message": "追加已导入样式到当前样式"
+		"message": "追加已导入样式到当前样式",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
 	},
 	"editorStylesButton": {
-		"message": "查找编辑器样式"
+		"message": "查找编辑器样式",
+		"description": "Find styles for the editor"
 	},
 	"optionsOpen": {
-		"message": "打开"
+		"message": "打开",
+		"description": ""
 	},
 	"helpKeyMapHotkey": {
-		"message": "按下热键"
+		"message": "按下热键",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"styleRegexpTestInvalid": {
-		"message": "忽略无效的正则表达式"
+		"message": "忽略无效的正则表达式",
+		"description": "RegExp test report: label for the invalid expressions"
 	},
 	"replaceAll": {
-		"message": "全部替换"
+		"message": "全部替换",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
 	},
 	"importReportUnchanged": {
-		"message": "样式导入无效。"
+		"message": "样式导入无效。",
+		"description": "Message in the report shown after importing styles"
 	},
 	"optionsActions": {
-		"message": "接下来要做什么"
+		"message": "接下来要做什么",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "跳转至行（或行:列）"
+		"message": "跳转至行（或行:列）",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
 	},
 	"manageOnlyLocalTooltip": {
-		"message": "（此样式无法通过 userstyles.org 页面进行安装）"
+		"message": "（此样式无法通过 userstyles.org 页面进行安装）",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "检查所有样式更新"
+		"message": "检查所有样式更新",
+		"description": "Label for the button to check all styles for updates"
 	},
 	"openOptionsManage": {
-		"message": "设置用户界面"
+		"message": "设置用户界面",
+		"description": "Go to Options UI"
 	},
 	"issuesHelp": {
-		"message": "<a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> 在已启用的这些规则中找到问题："
+		"message": "<a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> 在已启用的这些规则中找到问题：",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
 	},
 	"optionsCustomizeBadge": {
-		"message": "样式计数器"
+		"message": "样式计数器",
+		"description": ""
 	},
 	"importReportLegendIdentical": {
-		"message": "个相同的样式被忽略"
+		"message": "个相同的样式被忽略",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
 	},
 	"optionsPopupWidth": {
-		"message": "样式管理弹出框宽度 px"
+		"message": "样式管理弹出框宽度 px",
+		"description": ""
 	},
 	"confirmNo": {
-		"message": "否"
+		"message": "否",
+		"description": "'No' button in a confirm dialog"
 	},
 	"undo": {
-		"message": "撤销"
+		"message": "撤销",
+		"description": "Button label"
 	},
 	"cm_keyMap": {
-		"message": "键盘映射"
+		"message": "键盘映射",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
 	},
 	"manageNewUI": {
-		"message": "启用新的样式管理界面"
+		"message": "启用新的样式管理界面",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
 	},
 	"importReportUndoneTitle": {
-		"message": "样式导入被取消"
+		"message": "样式导入被取消",
+		"description": "Title of the message box shown after undoing the import of styles"
 	},
 	"genericDisabledLabel": {
-		"message": "未启用"
+		"message": "未启用",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "启用带智能缩进的标签页"
+		"message": "启用带智能缩进的标签页",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
 	"replaceWith": {
-		"message": "替换用"
+		"message": "替换用",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "删除"
+		"message": "删除",
+		"description": "Label for the button to delete a style"
 	},
 	"updateCheckManualUpdateForce": {
-		"message": "安装更新（将覆盖本地修改的样式）"
+		"message": "安装更新（将覆盖本地修改的样式）",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
 	},
 	"optionsAdvancedExposeIframes": {
-		"message": "通过 HTML[stylus-iframe] 方式改变 iframes 的 css"
+		"message": "通过 HTML[stylus-iframe] 方式改变 iframes 的 css",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "编写新样式"
+		"message": "编写新样式",
+		"description": "Label for the button to go to the add style page"
 	},
 	"optionsUpdateIntervalNote": {
-		"message": "设置为 0 则关闭样式自动更新检查"
+		"message": "设置为 0 则关闭样式自动更新检查",
+		"description": ""
 	},
 	"backupButtons": {
-		"message": "备份"
+		"message": "备份",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "只显示已启用的样式"
+		"message": "只显示已启用的样式",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "修改"
+		"message": "修改",
+		"description": "Label for the button to go to the edit style page"
 	},
 	"cm_theme": {
-		"message": "主题"
+		"message": "主题",
+		"description": "Label for the style editor's CSS theme."
 	},
 	"backupMessage": {
-		"message": "拖放一个 json 备份文件到这个页面，即可导入数据库"
+		"message": "拖放一个 json 备份文件到这个页面，即可导入数据库",
+		"description": "Message for backup"
 	},
 	"importReportUndone": {
-		"message": "个样式被还原"
+		"message": "个样式被还原",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "输入命令名称"
+		"message": "输入命令名称",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "Stylus 是一个调整网页外观的用户样式管理器。它可让您轻松地为许多热门网站网站安装主题和皮肤。"
+		"message": "Stylus 是一个调整网页外观的用户样式管理器。它可让您轻松地为许多热门网站网站安装主题和皮肤。",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index fc500575..e6119371 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -1,142 +1,337 @@
 {
 	"appliesToEverything": {
-		"message": "全部"
+		"message": "全部",
+		"description": "Text displayed for styles that apply to all sites"
 	},
 	"defaultTheme": {
-		"message": "默認"
+		"message": "默認",
+		"description": "Default CodeMirror CSS theme option on the edit style page"
+	},
+	"styleRegexpTestTitle": {
+		"message": "符合的已開啟分頁清單（在 URL 上點選以將焦點轉移至它的分頁）",
+		"description": "RegExp test report: title of the report"
+	},
+	"bckpInstStyles": {
+		"message": "匯出樣式",
+		"description": ""
+	},
+	"optionsUpdateInterval": {
+		"message": "自動檢查並安裝可用的使用者樣式更新（以小時計）",
+		"description": ""
+	},
+	"styleEnabledToggleHint": {
+		"message": "按下 Alt + Enter 以切換啟用／停用狀態並儲存樣式",
+		"description": "Help text for the '[x] enable' checkbox in the editor"
 	},
 	"exportLabel": {
-		"message": "導出"
+		"message": "導出",
+		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
 	"issues": {
-		"message": "問題"
+		"message": "問題",
+		"description": "Label for the CSSLint issues block on the style edit page"
+	},
+	"optionsBadgeNormal": {
+		"message": "背景顏色",
+		"description": ""
+	},
+	"updateCheckHistory": {
+		"message": "更新檢查的歷史",
+		"description": ""
 	},
 	"cm_tabSize": {
-		"message": "Tab大小"
+		"message": "Tab大小",
+		"description": "Label for the text box controlling tab size option for the style editor."
 	},
 	"enableStyleLabel": {
-		"message": "啟用"
+		"message": "啟用",
+		"description": "Label for the button to enable a style"
 	},
 	"styleMissingName": {
-		"message": "請輸入名稱。"
+		"message": "請輸入名稱。",
+		"description": "Error displayed when user saves without providing a name"
+	},
+	"genericHistoryLabel": {
+		"message": "歷史",
+		"description": "Used in various places to show a history log of something"
+	},
+	"shortcutsNote": {
+		"message": "定義鍵盤快捷鍵",
+		"description": ""
 	},
 	"appliesDomainOption": {
-		"message": "該域名上的網址"
+		"message": "該域名上的網址",
+		"description": "Option to make the style apply to the entered string as a domain"
 	},
 	"checkForUpdate": {
-		"message": "檢查更新"
+		"message": "檢查更新",
+		"description": "Label for the button to check a single style for an update"
+	},
+	"styleNotAppliedRegexpProblemTooltip": {
+		"message": "因為不正確的 'regexp()' 使用導致未套用",
+		"description": "Tooltip in the popup for styles that were not applied at all"
+	},
+	"styleRegexpInvalidExplanation": {
+		"message": "部份 'regexp()' 歸則可能不再能被編譯。",
+		"description": ""
+	},
+	"optionsIconDark": {
+		"message": "暗色瀏覽器主題",
+		"description": ""
 	},
 	"importAppendLabel": {
-		"message": "追加到樣式"
+		"message": "追加到樣式",
+		"description": "Label for the button to import a style and append to the existing sections"
+	},
+	"optionsOpenManager": {
+		"message": "管理樣式",
+		"description": ""
 	},
 	"updateAllCheckSucceededNoUpdate": {
-		"message": "樣式都是最新的。"
+		"message": "樣式都是最新的。",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"importReportLegendAdded": {
+		"message": "已加入",
+		"description": "Text after the number of styles added in the report shown after importing styles"
 	},
 	"styleFromMozillaFormatPrompt": {
-		"message": "粘貼Mozilla格式代碼"
+		"message": "粘貼Mozilla格式代碼",
+		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
+	},
+	"dragDropMessage": {
+		"message": "將您的備份檔拖曳到此頁面的任何地方以匯入。",
+		"description": "Drag'n'drop message"
 	},
 	"helpAlt": {
-		"message": "幫助"
+		"message": "幫助",
+		"description": "Alternate text for help buttons"
+	},
+	"confirmOK": {
+		"message": "確定",
+		"description": ""
 	},
 	"search": {
-		"message": "搜索"
+		"message": "搜索",
+		"description": "Label before the search input field in the editor shown on Ctrl-F"
+	},
+	"manageFaviconsGray": {
+		"message": "灰階淡出",
+		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
 	},
 	"confirmYes": {
-		"message": "是"
+		"message": "是",
+		"description": "'Yes' button in a confirm dialog"
 	},
 	"findStylesForSite": {
-		"message": "查找更多適合此網站的樣式"
+		"message": "查找更多適合此網站的樣式",
+		"description": "Text for a link that gets a list of styles for the current site"
 	},
 	"manageHeading": {
-		"message": "已安裝的樣式"
+		"message": "已安裝的樣式",
+		"description": "Heading for the manage page"
 	},
 	"styleBeautify": {
-		"message": "美化"
+		"message": "美化",
+		"description": "Label for the CSS-beautifier button on the edit style page"
+	},
+	"styleRegexpProblemTooltip": {
+		"message": "因為不正確的 'regexp()' 使用導致未套用的樣式段數量",
+		"description": "Tooltip in the popup for styles that were applied only partially"
 	},
 	"styleEnabledLabel": {
-		"message": "已啟用"
+		"message": "已啟用",
+		"description": "Label for the enabled state of styles"
 	},
 	"styleToMozillaFormatHelp": {
-		"message": "Mozilla格式的樣式代碼能在火狐版Stylus使用，也可以提交至 userstyles.org 。"
+		"message": "Mozilla格式的樣式代碼能在火狐版Stylus使用，也可以提交至 userstyles.org 。",
+		"description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
 	},
 	"sectionAdd": {
-		"message": "再添加一個樣式段"
+		"message": "再添加一個樣式段",
+		"description": "Label for the button to add a section"
+	},
+	"styleRegexpTestPartial": {
+		"message": "不完全符合，因而跳過",
+		"description": "RegExp test report: label for the partially matching expressions"
 	},
 	"styleSaveLabel": {
-		"message": "保存"
+		"message": "保存",
+		"description": "Label for save button for style editing"
+	},
+	"confirmDelete": {
+		"message": "刪除",
+		"description": ""
+	},
+	"confirmCancel": {
+		"message": "取消",
+		"description": ""
+	},
+	"retrieveBckp": {
+		"message": "匯入樣式",
+		"description": ""
 	},
 	"confirmStop": {
-		"message": "停止"
+		"message": "停止",
+		"description": "'Stop' button in a confirm dialog"
 	},
 	"writeStyleForURL": {
-		"message": "此網址"
+		"message": "此網址",
+		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
+	},
+	"optionsSubheading": {
+		"message": "更多選項",
+		"description": "Subheading for options section on manage page."
 	},
 	"appliesAdd": {
-		"message": "添加"
+		"message": "添加",
+		"description": "Label for the button to add an 'applies' entry"
 	},
 	"appliesRegexpOption": {
-		"message": "匹配正則表示式的網址"
+		"message": "匹配正則表示式的網址",
+		"description": "Option to make the style apply to the entered string as a regular expression"
+	},
+	"optionsAdvancedExposeIframesNote": {
+		"message": "啟用寫入特定 iframe 的 CSS，如 'html[stylus-iframe] h1 { display:none }'",
+		"description": ""
+	},
+	"importReportLegendUpdatedCode": {
+		"message": "已更新的程式碼",
+		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
 	},
 	"styleInstall": {
 		"message": "安裝 '$stylename$' 到 Stylus ？",
+		"description": "Confirmation when installing a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsBadgeDisabled": {
+		"message": "停用時的背景顏色",
+		"description": ""
+	},
+	"optionsCheck": {
+		"message": "更新樣式",
+		"description": ""
+	},
+	"manageText": {
+		"message": "<a href='https://userstyles.org'>在 userstyles.org 上取得樣式</a> | <a href='http://add0n.com/stylus.html'>取得協助</a>",
+		"description": "Help text on the manage page"
+	},
+	"manageOnlyLocal": {
+		"message": "僅本機建立的樣式",
+		"description": "Checkbox to show only locally created styles i.e. non-updatable"
+	},
 	"searchStyles": {
-		"message": "搜索內容"
+		"message": "搜索內容",
+		"description": "Label for the search filter textbox on the Manage styles page"
+	},
+	"optionsUpdateImportNote": {
+		"message": "當從舊版本或是從 Stylish 匯入樣式備份時，在樣式管理員中手動進行一次更新檢查，以確保所有樣式都被更新。",
+		"description": ""
+	},
+	"checkAllUpdatesForce": {
+		"message": "再次檢查，我沒有編輯任何樣式！",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"unreachableFileHint": {
+		"message": "Stylus 僅在您於 chrome://extensions 啟用了 Stylus 擴充套件中對應的勾選框時才能存取 file:// 的 URL。",
+		"description": "Note in the toolbar popup for file:// URLs"
 	},
 	"disableStyleLabel": {
-		"message": "禁用"
+		"message": "禁用",
+		"description": "Label for the button to disable a style"
 	},
 	"prefShowBadge": {
-		"message": "在工具欄按鈕上顯示當前網站已生效的樣式表數目。"
+		"message": "在工具欄按鈕上顯示當前網站已生效的樣式表數目。",
+		"description": "Label for the checkbox controlling toolbar badge text."
+	},
+	"manageFavicons": {
+		"message": "Favicons 要套用到的欄位",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
 	},
 	"menuShowBadge": {
-		"message": "顯示生效的樣式數目"
+		"message": "顯示生效的樣式數目",
+		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
 	},
 	"cm_lineWrapping": {
-		"message": "自動換行"
+		"message": "自動換行",
+		"description": "Label for the checkbox controlling word wrap option for the style editor."
 	},
 	"styleCancelEditLabel": {
-		"message": "返回到管理頁面"
+		"message": "返回到管理頁面",
+		"description": "Label for cancel button for style editing"
 	},
 	"styleChangesNotSaved": {
-		"message": "你已經修改了此樣式，但尚未保存。"
+		"message": "你已經修改了此樣式，但尚未保存。",
+		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
 	"importLabel": {
-		"message": "導入"
+		"message": "導入",
+		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
+	},
+	"shortcuts": {
+		"message": "快捷鍵",
+		"description": "Go to shortcut configuration"
 	},
 	"updateCheckFailServerUnreachable": {
-		"message": "更新失敗: 無法訪問伺服器。"
+		"message": "更新失敗: 無法訪問伺服器。",
+		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
 	"manageFilters": {
-		"message": "過濾器"
+		"message": "過濾器",
+		"description": "Label for filters container"
 	},
 	"applyAllUpdates": {
-		"message": "應用所有更新"
+		"message": "應用所有更新",
+		"description": "Label for the button to apply all detected updates"
+	},
+	"optionsReset": {
+		"message": "重設選項為預設值",
+		"description": ""
+	},
+	"optionsCustomizeUpdate": {
+		"message": "更新",
+		"description": ""
 	},
 	"deleteStyleConfirm": {
-		"message": "確定要刪除這個樣式嗎？"
+		"message": "確定要刪除這個樣式嗎？",
+		"description": "Confirmation before deleting a style"
+	},
+	"optionsCustomizePopup": {
+		"message": "彈出式視窗",
+		"description": ""
 	},
 	"styleBadRegexp": {
-		"message": "正規表示式無效。"
+		"message": "正規表示式無效。",
+		"description": "Validation message for a bad regexp in a style"
 	},
 	"optionsHeading": {
-		"message": "選項"
+		"message": "選項",
+		"description": "Heading for options section on manage page."
 	},
 	"appliesDisplay": {
 		"message": "適用於： $applies$",
+		"description": "Text on the manage screen to describe what the style applies to",
 		"placeholders": {
 			"applies": {
 				"content": "$1"
 			}
 		}
 	},
+	"optionsIconLight": {
+		"message": "亮色瀏覽器主題",
+		"description": ""
+	},
+	"openStylesManager": {
+		"message": "開啟樣式管理員",
+		"description": "Label for the style maanger opener in the browser action context menu."
+	},
 	"styleUpdate": {
 		"message": "你確定你要更新 '$stylename$' ？",
+		"description": "Confirmation when updating a style",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -144,10 +339,16 @@
 		}
 	},
 	"styleSectionsTitle": {
-		"message": "樣式段"
+		"message": "樣式段",
+		"description": "Title for the style sections section"
+	},
+	"importReportLegendInvalid": {
+		"message": "已跳過無效的",
+		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
 	},
 	"editStyleTitle": {
 		"message": "編輯樣式 $stylename$",
+		"description": "Title of the page for editing styles",
 		"placeholders": {
 			"stylename": {
 				"content": "$1"
@@ -155,49 +356,100 @@
 		}
 	},
 	"updateCheckSucceededNoUpdate": {
-		"message": "樣式已是最新的。"
+		"message": "樣式已是最新的。",
+		"description": "Text that displays when an update check completed and no update is available"
 	},
 	"appliesUrlPrefixOption": {
-		"message": "含以下前綴的網址"
+		"message": "含以下前綴的網址",
+		"description": "Option to make the style apply to the entered string as a URL prefix"
+	},
+	"cm_matchHighlightToken": {
+		"message": "在游標下的 Token",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
 	},
 	"searchRegexp": {
-		"message": "使用/re/句法正則表達式搜索"
+		"message": "使用/re/句法正則表達式搜索",
+		"description": "Label after the search input field in the editor shown on Ctrl-F"
+	},
+	"updateCheckManualUpdateHint": {
+		"message": "強制更新覆蓋任何本機編輯。",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"toggleStyle": {
+		"message": "切換樣式",
+		"description": "Label for the checkbox to enable/disable a style"
 	},
 	"importReplaceTooltip": {
-		"message": "棄用當前樣式內容并用導入樣式覆蓋"
+		"message": "棄用當前樣式內容并用導入樣式覆蓋",
+		"description": "Label for the button to import and overwrite current style"
+	},
+	"cm_resizeGripHint": {
+		"message": "雙擊以最大化／復原高度",
+		"description": "Tooltip for the resize grip in style editor"
 	},
 	"popupStylesFirst": {
-		"message": "在工具欄按鈕命令行前列出樣式"
+		"message": "在工具欄按鈕命令行前列出樣式",
+		"description": "Label for the checkbox controlling section order in the popup."
 	},
 	"sectionHelp": {
-		"message": "樣式段讓你能在同一個樣式中定義適用於不同網段的不同代碼段。例如，僅僅一個樣式就能以一種樣式改變一個網站的主頁，同時以另一種樣式改變這個網站的其他頁面。"
+		"message": "樣式段讓你能在同一個樣式中定義適用於不同網段的不同代碼段。例如，僅僅一個樣式就能以一種樣式改變一個網站的主頁，同時以另一種樣式改變這個網站的其他頁面。",
+		"description": "Help text for sections"
 	},
 	"noStylesForSite": {
-		"message": "當前網站沒有安裝任何樣式。"
+		"message": "當前網站沒有安裝任何樣式。",
+		"description": "Text displayed when no styles are installed for the current site"
 	},
 	"appliesDisplayTruncatedSuffix": {
-		"message": "以及更多"
+		"message": "以及更多",
+		"description": "Text added to appliesDisplay when there are more sites for the style than are displayed"
 	},
 	"appliesRemove": {
-		"message": "移除"
+		"message": "移除",
+		"description": "Label for the button to remove an 'applies' entry"
+	},
+	"updatesCurrentlyInstalled": {
+		"message": "更新已安裝的：",
+		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
 	},
 	"styleToMozillaFormatTitle": {
-		"message": "Mozilla格式樣式表"
+		"message": "Mozilla格式樣式表",
+		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
+	},
+	"manageTitle": {
+		"message": "Stylus",
+		"description": "Title for the manage page"
 	},
 	"writeStyleFor": {
-		"message": "編寫樣式給："
+		"message": "編寫樣式給：",
+		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
 	"replace": {
-		"message": "替換"
+		"message": "替換",
+		"description": "Label before the replace input field in the editor shown on Ctrl-H"
+	},
+	"styleRegexpTestNone": {
+		"message": "沒有符合的分頁",
+		"description": "RegExp test report: label for expressions that didn't match any tabs"
+	},
+	"importReportLegendUpdatedMeta": {
+		"message": "已更新後設資訊",
+		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
 	},
 	"appliesLabel": {
-		"message": "適用於"
+		"message": "適用於",
+		"description": "Label for 'applies to' fields on the edit/add screen"
+	},
+	"openOptionsPopup": {
+		"message": "選項",
+		"description": "Go to Options UI"
 	},
 	"openManage": {
-		"message": "管理已安裝樣式"
+		"message": "管理已安裝樣式",
+		"description": "Link to open the manage page."
 	},
 	"updateCheckFailBadResponseCode": {
 		"message": "更新失敗: 伺服器傳回代碼 $code$。",
+		"description": "Text that displays when an update check failed because the response code indicates an error",
 		"placeholders": {
 			"code": {
 				"content": "$1"
@@ -205,108 +457,311 @@
 		}
 	},
 	"appliesSpecify": {
-		"message": "指定"
+		"message": "指定",
+		"description": "Label for the button to make a style apply only to specific sites"
 	},
 	"installUpdate": {
-		"message": "安裝更新"
+		"message": "安裝更新",
+		"description": "Label for the button to install an update for a single style"
+	},
+	"optionsCheckUpdate": {
+		"message": "檢查並安裝所有可用的更新",
+		"description": ""
+	},
+	"importReportTitle": {
+		"message": "匯入樣式已完成",
+		"description": "Title of the report shown after importing styles"
 	},
 	"styleMozillaFormatHeading": {
-		"message": "Mozilla格式"
+		"message": "Mozilla格式",
+		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus 不能在諸如此類的網頁上生效。"
+	"cm_matchHighlight": {
+		"message": "突顯",
+		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
+	},
+	"styleRegexpPartialExplanation": {
+		"message": "這個樣式使用部份符合的正規表達式，違反了 <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document 規範</a>，其需要完整的 URL 符合。授影響的 CSS 不會討用在頁面上。這個樣式由 Chrome 板 Stylish 所建立，其在早期版本不正確地檢查 'regexp()' 規則（已知的臭蟲）。",
+		"description": ""
+	},
+	"styleBeautifyIndentConditional": {
+		"message": "縮排 @media, @supports",
+		"description": "CSS-beautifier option"
+	},
+	"unreachableContentScript": {
+		"message": "無法與頁面通訊。嘗試重新載入分頁。",
+		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
 	},
 	"sectionRemove": {
-		"message": "移除樣式段"
+		"message": "移除樣式段",
+		"description": "Label for the button to remove a section"
 	},
 	"disableAllStyles": {
-		"message": "禁用所有樣式"
+		"message": "禁用所有樣式",
+		"description": "Label for the checkbox that turns all enabled styles off."
+	},
+	"updateCheckSkippedMaybeLocallyEdited": {
+		"message": "這個樣式可能在本機被編輯過。",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
 	},
 	"undoGlobal": {
-		"message": "撤銷（全局）"
+		"message": "撤銷（全局）",
+		"description": "CSS-beautify global Undo button label"
+	},
+	"optionsCustomizeIcon": {
+		"message": "工具列圖示",
+		"description": ""
 	},
 	"updateCompleted": {
-		"message": "更新完成。"
+		"message": "更新完成。",
+		"description": "Text that displays when an update completed"
 	},
 	"checkingForUpdate": {
-		"message": "檢查中…"
+		"message": "檢查中…",
+		"description": "Text to display when checking a style for an update"
+	},
+	"styleRegexpTestFull": {
+		"message": "符合的分頁",
+		"description": "RegExp test report: label for the fully matching expressions"
+	},
+	"manageMaxTargets": {
+		"message": "已套用項目的數量",
+		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
+	},
+	"manageFaviconsHelp": {
+		"message": "Stylus 使用外部服務 https://www.google.com/s2/favicons",
+		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
+	},
+	"updateCheckSkippedLocallyEdited": {
+		"message": "這個樣式已在本機編輯。",
+		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsResetButton": {
+		"message": "重設選項",
+		"description": ""
 	},
 	"sectionCode": {
-		"message": "代碼"
+		"message": "代碼",
+		"description": "Label for the code for a section"
+	},
+	"optionsAdvancedContextDelete": {
+		"message": "在編輯器的右鍵選單中加入「刪除」",
+		"description": ""
+	},
+	"importReportLegendUpdatedBoth": {
+		"message": "後設資訊與程式碼均已更新",
+		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
 	},
 	"cm_smartIndent": {
-		"message": "使用智能縮進"
+		"message": "使用智能縮進",
+		"description": "Label for the checkbox controlling smart indentation option for the style editor."
+	},
+	"styleRegexpTestButton": {
+		"message": "正規表達式測試",
+		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
 	},
 	"appliesHelp": {
-		"message": "使用「適用於」控件來限制這個樣式段適用的網址。"
+		"message": "使用「適用於」控件來限制這個樣式段適用的網址。",
+		"description": "Help text for 'applies to' section"
 	},
 	"editStyleHeading": {
-		"message": "編輯樣式"
+		"message": "編輯樣式",
+		"description": "Title of the page for editing styles"
+	},
+	"editDeleteText": {
+		"message": "删除",
+		"description": "Label for the context menu item in the editor to delete selected text"
+	},
+	"cm_autocompleteOnTyping": {
+		"message": "在輸入時自動完成",
+		"description": "Label for the checkbox in the style editor."
+	},
+	"stylusUnavailableForURLdetails": {
+		"message": "做為安全措施，瀏覽器禁止擴充功能影響其內建頁面（像是 chrome://version 或是 about:addons）與其他擴充功能頁面。每個瀏覽器都會限制只能在其擴充功能商店上安裝擴充功能（如 Chrome 線上應用程式商店或 AMO）。",
+		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"cm_matchHighlightSelection": {
+		"message": "僅段",
+		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
 	"appliesUrlOption": {
-		"message": "網址"
+		"message": "網址",
+		"description": "Option to make the style apply to the entered string as a URL"
+	},
+	"updateAllCheckSucceededSomeEdited": {
+		"message": "一些可更新的樣式不會檢查以避免遺失可能有的本機編輯。更新可以強制獨立檢查，或是對所有樣式都執行檢查（本機編輯將會被覆寫）。",
+		"description": "Text that displays when an update all check completed and no updates are available"
+	},
+	"stylusUnavailableForURL": {
+		"message": "Stylus 不能在諸如此類的網頁上生效。",
+		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
+	},
+	"manageOnlyUpdates": {
+		"message": "僅有更新或是有問題的",
+		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
 	},
 	"addStyleTitle": {
-		"message": "添加樣式"
+		"message": "添加樣式",
+		"description": "Title of the page for adding styles"
 	},
 	"importReplaceLabel": {
-		"message": "覆蓋樣式"
+		"message": "覆蓋樣式",
+		"description": "Label for the button to import and overwrite current style"
 	},
 	"dbError": {
-		"message": "使用 Stylus 資料庫時出現錯誤。你想訪問可能包含解決辦法的網頁嗎？"
+		"message": "使用 Stylus 資料庫時出現錯誤。你想訪問可能包含解決辦法的網頁嗎？",
+		"description": "Prompt when a DB error is encountered"
+	},
+	"optionsAdvanced": {
+		"message": "進階",
+		"description": ""
 	},
 	"importAppendTooltip": {
-		"message": "追加導入的樣式到當前樣式"
+		"message": "追加導入的樣式到當前樣式",
+		"description": "Tooltip for the button to import a style and append to the existing sections"
+	},
+	"editorStylesButton": {
+		"message": "找到編輯器樣式",
+		"description": "Find styles for the editor"
+	},
+	"optionsOpen": {
+		"message": "開啟",
+		"description": ""
 	},
 	"helpKeyMapHotkey": {
-		"message": "按下熱鍵"
+		"message": "按下熱鍵",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
+	},
+	"styleRegexpTestInvalid": {
+		"message": "已跳過無效的正規表達式",
+		"description": "RegExp test report: label for the invalid expressions"
 	},
 	"replaceAll": {
-		"message": "替換所有"
+		"message": "替換所有",
+		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+	},
+	"importReportUnchanged": {
+		"message": "沒有變更。",
+		"description": "Message in the report shown after importing styles"
+	},
+	"optionsActions": {
+		"message": "動作",
+		"description": ""
 	},
 	"editGotoLine": {
-		"message": "跳到行（或 line:col ）"
+		"message": "跳到行（或 line:col ）",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
+	"manageOnlyLocalTooltip": {
+		"message": "（不是透過 userstyles.org 網頁安裝的樣式）",
+		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
 	},
 	"checkAllUpdates": {
-		"message": "檢查所有樣式更新"
+		"message": "檢查所有樣式更新",
+		"description": "Label for the button to check all styles for updates"
+	},
+	"openOptionsManage": {
+		"message": "選項介面",
+		"description": "Go to Options UI"
 	},
 	"issuesHelp": {
-		"message": "由<a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>發現啟用這些規則會產生衝突"
+		"message": "由<a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>發現啟用這些規則會產生衝突",
+		"description": "Help popup message for the CSSLint issues block on the style edit page"
+	},
+	"optionsCustomizeBadge": {
+		"message": "在工具列圖示上的徽章",
+		"description": ""
+	},
+	"importReportLegendIdentical": {
+		"message": "已跳過相同的",
+		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
+	},
+	"optionsPopupWidth": {
+		"message": "彈出視窗寬度（以像素計）",
+		"description": ""
 	},
 	"confirmNo": {
-		"message": "否"
+		"message": "否",
+		"description": "'No' button in a confirm dialog"
 	},
 	"undo": {
-		"message": "撤銷"
+		"message": "撤銷",
+		"description": "Button label"
 	},
 	"cm_keyMap": {
-		"message": "鍵盤映射"
+		"message": "鍵盤映射",
+		"description": "Label for the drop-down list controlling the keymap for the style editor."
+	},
+	"manageNewUI": {
+		"message": "新的管理介面佈局",
+		"description": "Label for the checkbox that toggles the new UI on manage page"
+	},
+	"importReportUndoneTitle": {
+		"message": "匯入已被復原",
+		"description": "Title of the message box shown after undoing the import of styles"
+	},
+	"genericDisabledLabel": {
+		"message": "已停用",
+		"description": "Used in various lists/options to indicate that something is disabled"
 	},
 	"cm_indentWithTabs": {
-		"message": "用Tab鍵智能縮進"
+		"message": "用Tab鍵智能縮進",
+		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
 	"replaceWith": {
-		"message": "替換為"
+		"message": "替換為",
+		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
 	},
 	"deleteStyleLabel": {
-		"message": "删除"
+		"message": "删除",
+		"description": "Label for the button to delete a style"
+	},
+	"updateCheckManualUpdateForce": {
+		"message": "安裝更新（本機編輯將會被覆寫）",
+		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
+	},
+	"optionsAdvancedExposeIframes": {
+		"message": "透過 HTML[stylus-iframe] 公開 iframes",
+		"description": ""
 	},
 	"addStyleLabel": {
-		"message": "編寫新樣式"
+		"message": "編寫新樣式",
+		"description": "Label for the button to go to the add style page"
+	},
+	"optionsUpdateIntervalNote": {
+		"message": "要停用自動化使用者樣式更新檢查，設定間隔為 0",
+		"description": ""
+	},
+	"backupButtons": {
+		"message": "備份",
+		"description": "Heading for backup"
 	},
 	"manageOnlyEnabled": {
-		"message": "只顯示已啟用的樣式"
+		"message": "只顯示已啟用的樣式",
+		"description": "Checkbox to show only enabled styles"
 	},
 	"editStyleLabel": {
-		"message": "編輯"
+		"message": "編輯",
+		"description": "Label for the button to go to the edit style page"
 	},
 	"cm_theme": {
-		"message": "主題"
+		"message": "主題",
+		"description": "Label for the style editor's CSS theme."
+	},
+	"backupMessage": {
+		"message": "選取檔案並拖曳到此頁面。",
+		"description": "Message for backup"
+	},
+	"importReportUndone": {
+		"message": "樣式已被復原",
+		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
 	},
 	"helpKeyMapCommand": {
-		"message": "鍵入命令名稱"
+		"message": "鍵入命令名稱",
+		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
 	"description": {
-		"message": "用Stylus（一個用戶樣式管理器）重塑網頁。 Stylus 讓你能為诸多主流網站輕鬆的安裝主題和皮膚。"
+		"message": "用Stylus（一個用戶樣式管理器）重塑網頁。 Stylus 讓你能為诸多主流網站輕鬆的安裝主題和皮膚。",
+		"description": "Extension description"
 	}
-}
+}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 7e6f1741..4f2ccca1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Stylus",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "minimum_chrome_version": "49",
   "description": "__MSG_description__",
   "homepage_url": "http://add0n.com/stylus.html",

From bf94aa93cf2a81f010456889963e2bd680ff688a Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 12 Jul 2017 11:27:57 +0300
Subject: [PATCH 69/94] pull_locales_postprocess: deduplicate and
 placeholderize

---
 pull_locales.sh                               |  2 +-
 ...eholders.py => pull_locales_postprocess.py | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)
 rename fill_locale_placeholders.py => pull_locales_postprocess.py (57%)

diff --git a/pull_locales.sh b/pull_locales.sh
index a1e4531d..a53ccee3 100755
--- a/pull_locales.sh
+++ b/pull_locales.sh
@@ -1,2 +1,2 @@
 ruby pull_locales.rb
-python fill_locale_placeholders.py
+python pull_locales_postprocess.py
diff --git a/fill_locale_placeholders.py b/pull_locales_postprocess.py
similarity index 57%
rename from fill_locale_placeholders.py
rename to pull_locales_postprocess.py
index 37027738..a57ebc2d 100644
--- a/fill_locale_placeholders.py
+++ b/pull_locales_postprocess.py
@@ -3,23 +3,34 @@ import io, os, json, re
 from collections import OrderedDict
 
 with io.open('_locales/en/messages.json', 'r', encoding='utf-8') as f:
-    english_placeholders = [(k, v['placeholders']) for k,v in json.load(f).items()
+    items = json.load(f).items()
+    english = [(k, v['message']) for k, v in items if 'message' in v]
+    english_placeholders = [(k, v['placeholders']) for k,v in items
                             if 'placeholders' in v]
 
 for locale_name in os.listdir('_locales'):
     if locale_name == 'en':
         continue
+    if not re.match(r'^\w{2}(_\w{2,3})?$', locale_name):
+        print('Skipped %s: not a locale dir' % locale_name)
+        continue
     loc_path = '_locales/' + locale_name + '/messages.json'
     with io.open(loc_path, 'r+', encoding='utf-8') as f:
         loc = json.load(f, object_pairs_hook=OrderedDict)
 
+        deduplicated = 0
+        for msgId, message in english:
+            if msgId in loc and loc[msgId].get('message', '') == message:
+                del loc[msgId]
+                deduplicated += 1
+
         changed = 0
         for msgId, placeholder in english_placeholders:
-            if msgId in loc and cmp(placeholder, loc[msgId].get('placeholders', None))!=0:
+            if msgId in loc and cmp(placeholder, loc[msgId].get('placeholders', None)) != 0:
                 loc[msgId]['placeholders'] = placeholder
                 changed += 1
 
-        if changed > 0:
+        if deduplicated > 0 or changed > 0:
             f.seek(0)
             json_str = json.dumps(loc, indent=1, ensure_ascii=False,
                                   separators=(',', ': '), encoding='utf-8')
@@ -27,4 +38,8 @@ for locale_name in os.listdir('_locales'):
                                json_str, flags=re.MULTILINE)
             f.write(json_tabs)
             f.truncate()
-            print 'Placeholders added to %s: %d' % (locale_name, changed)
+            print('%s: %d deduplicated%s' % (
+                locale_name,
+                deduplicated,
+                ', %d placeholder(s) added' % changed if changed else ''
+            ))

From 36b6485cd0e4f7b3ad5705f86e049923d132e558 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 12 Jul 2017 11:28:21 +0300
Subject: [PATCH 70/94] deduplicate and placeholderize locales

---
 _locales/ar/messages.json    | 557 ----------------------------------
 _locales/cs/messages.json    |   8 -
 _locales/de/messages.json    |  36 ---
 _locales/el/messages.json    | 472 -----------------------------
 _locales/es/messages.json    |  12 -
 _locales/fi/messages.json    | 541 ---------------------------------
 _locales/fr/messages.json    | 496 -------------------------------
 _locales/it/messages.json    | 561 -----------------------------------
 _locales/ja/messages.json    | 144 ---------
 _locales/nl/messages.json    | 368 -----------------------
 _locales/pt_BR/messages.json | 557 ----------------------------------
 _locales/ru/messages.json    |   8 -
 _locales/sr/messages.json    | 356 ----------------------
 _locales/sv/messages.json    | 468 -----------------------------
 _locales/tr/messages.json    | 561 -----------------------------------
 _locales/zh/messages.json    | 548 ----------------------------------
 _locales/zh_CN/messages.json |   4 -
 _locales/zh_TW/messages.json |   4 -
 18 files changed, 5701 deletions(-)

diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index 0472f9ff..56ca799a 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -3,46 +3,6 @@
 		"message": "كل شيء",
 		"description": "Text displayed for styles that apply to all sites"
 	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
-	},
 	"enableStyleLabel": {
 		"message": "تمكين",
 		"description": "Label for the button to enable a style"
@@ -51,14 +11,6 @@
 		"message": "أدخل اسمًا.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "عناوين URL في النطاق",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,62 +19,10 @@
 		"message": "البحث عن تحديث",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "No updates found.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "مساعدة",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
 	"findStylesForSite": {
 		"message": "البحث عن المزيد من الأنماط لموقع الويب هذا",
 		"description": "Text for a link that gets a list of styles for the current site"
@@ -131,14 +31,6 @@
 		"message": "الأنماط المثبتة",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "ممكّن",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +43,10 @@
 		"message": "إضافة قسم آخر",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "حفظ",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
-	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "إضافة",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +55,6 @@
 		"message": "عناوين URL التي تطابق regexp",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "هل تريد تثبيت '$stylename$' في Stylus؟",
 		"description": "Confirmation when installing a style",
@@ -208,58 +64,10 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "تعطيل",
 		"description": "Label for the button to disable a style"
 	},
-	"prefShowBadge": {
-		"message": "Number of styles active for the current site",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
-	},
 	"styleCancelEditLabel": {
 		"message": "رجوع للإدارة",
 		"description": "Label for cancel button for style editing"
@@ -268,50 +76,14 @@
 		"message": "لقد أجريت تغييرات على هذا النمط بدون حفظها.",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "أخفق التحديث - الخادم يتعذر الوصول إليه.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "هل تريد بالتأكيد حذف هذا النمط؟",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
-	},
 	"appliesDisplay": {
 		"message": "ينطبق على: $applies$",
 		"description": "Text on the manage screen to describe what the style applies to",
@@ -321,31 +93,10 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
 		"message": "الأقسام",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "تعديل النمط $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,34 +114,6 @@
 		"message": "عناوين URL البادئة بـ",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
-	"popupStylesFirst": {
-		"message": "Styles before commands",
-		"description": "Label for the checkbox controlling section order in the popup."
-	},
 	"sectionHelp": {
 		"message": "تتيح لك الأقسام تحديد أجزاء مختلفة من الرمز لتطبيقها على مجموعات مختلفة من عناوين URL بالنمط نفسه. فعلى سبيل المثال، يمكن لنمط مفرد تغيير الصفحة الرئيسية لموقع ويب بطريقة، مع تغيير بقية أجزاء موقع الويب بطريقة أخرى.",
 		"description": "Help text for sections"
@@ -407,42 +130,10 @@
 		"message": "إزالة",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "ينطبق على",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "إدارة الأنماط المثبتة",
 		"description": "Link to open the manage page."
@@ -464,54 +155,10 @@
 		"message": "تثبيت التحديث",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "إزالة القسم",
 		"description": "Label for the button to remove a section"
 	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
-	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "اكتمل التحديث.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +167,10 @@
 		"message": "جارٍ البحث...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "الرمز",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
-	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "استخدم عناصر تحكم 'ينطبق على' لتقييد عناوين URL التي ينطبق عليها الرمز في هذا القسم.",
 		"description": "Help text for 'applies to' section"
@@ -568,198 +179,30 @@
 		"message": "تعديل النمط",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
 	"appliesUrlOption": {
 		"message": "عنوان URL",
 		"description": "Option to make the style apply to the entered string as a URL"
 	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus doesn't work on pages like this.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "إضافة نمط",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
-	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "البحث عن تحديثات لكل الأنماط",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "حذف",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "كتابة نمط جديد",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
-	},
 	"editStyleLabel": {
 		"message": "تعديل",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
 	"description": {
 		"message": "يمكنك تغيير نمط الويب باستخدام Stylus، وهي أداة لإدارة أنماط المستخدم. وتتيح Stylus لك بسهولة تثبيت المظاهر والأشكال الخارجية لكل من Google، وFacebook وYouTube وOrkut فضلاً عن الكثير جدًا من مواقع الويب الأخرى.",
 		"description": "Extension description"
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 25aae826..fce24a4b 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -107,10 +107,6 @@
 		"message": "Nápověda",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
 	"search": {
 		"message": "Vyhledat",
 		"description": "Label before the search input field in the editor shown on Ctrl-F"
@@ -415,10 +411,6 @@
 		"message": "Styl v Mozilla formátu",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "Napsat nový styl pro:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 113fd405..1052a73e 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -107,10 +107,6 @@
 		"message": "Hilfe",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
 	"search": {
 		"message": "Suche",
 		"description": "Label before the search input field in the editor shown on Ctrl-F"
@@ -131,10 +127,6 @@
 		"message": "Installierte Styles",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
 	"styleRegexpProblemTooltip": {
 		"message": "Anzahl der Bereiche, welche aufgrund nicht korrekt verwendeter Regulärer Ausdrücke nicht angewendet wurden.",
 		"description": "Tooltip in the popup for styles that were applied only partially"
@@ -292,18 +284,10 @@
 		"message": "Setzt diese Einstellungen auf die Standard-Werte zurück.",
 		"description": ""
 	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Möchtest Du diesen Style wirklich löschen?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
 	"styleBadRegexp": {
 		"message": "Regulärer Ausdruck ist ungültig.",
 		"description": "Validation message for a bad regexp in a style"
@@ -415,10 +399,6 @@
 		"message": "Style im Mozilla Format",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "Style erstellen für:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
@@ -472,10 +452,6 @@
 		"message": "Importieren der Styles abgeschlossen.",
 		"description": "Title of the report shown after importing styles"
 	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
 	"cm_matchHighlight": {
 		"message": "Hervorheben",
 		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
@@ -540,10 +516,6 @@
 		"message": "Optionen zurücksetzten",
 		"description": ""
 	},
-	"sectionCode": {
-		"message": "Code",
-		"description": "Label for the code for a section"
-	},
 	"optionsAdvancedContextDelete": {
 		"message": "'Löschen' im Editor-Kontextmenü hinzufügen",
 		"description": ""
@@ -584,10 +556,6 @@
 		"message": "Nur die Auswahl",
 		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
 	"updateAllCheckSucceededSomeEdited": {
 		"message": "Einige Styles wurden nicht aktualisiert, um dem Verlust von lokalen Bearbeitungen vorzubeugen. Die Aktualisierungen können entweder durch einzelne manuelle Überprüfung oder durch eine erneute Ausführung der Aktualisierung für alle Styles erzwungen werden (Lokale Bearbeitungen werden dann überschrieben).",
 		"description": "Text that displays when an update all check completed and no updates are available"
@@ -744,10 +712,6 @@
 		"message": "Bearbeiten",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
 	"backupMessage": {
 		"message": "Wähle eine Datei aus oder ziehe die Datei auf diese Seite. (Drag and Drop)",
 		"description": "Message for backup"
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index ea843696..a6e0de1a 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -3,42 +3,6 @@
 		"message": "Τα πάντα",
 		"description": "Text displayed for styles that apply to all sites"
 	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
 	"cm_tabSize": {
 		"message": "Μέγεθος καρτέλας",
 		"description": "Label for the text box controlling tab size option for the style editor."
@@ -51,14 +15,6 @@
 		"message": "Εισάγετε ένα όνομα.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "URL στον τομέα",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,62 +23,14 @@
 		"message": "Έλεγχος για ενημερώσεις",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
 	"updateAllCheckSucceededNoUpdate": {
 		"message": "Όλα τα στυλ είναι ενημερωμένα.",
 		"description": "Text that displays when an update all check completed and no updates are available"
 	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Βοήθεια",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
 	"findStylesForSite": {
 		"message": "Αναζήτηση περισσότερων στυλ για αυτή την ιστοσελίδα",
 		"description": "Text for a link that gets a list of styles for the current site"
@@ -131,14 +39,6 @@
 		"message": "Εγκατεστημένα Στυλ",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Ενεργοποιημένη",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +51,14 @@
 		"message": "Προσθήκη ένος άλλου τμήματος",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Αποθήκευση",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
 	"writeStyleForURL": {
 		"message": "αυτή την διεύθυνση URL",
 		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Προσθήκη",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +67,6 @@
 		"message": "Διευθύνσεις URL που ταιριάζουν με την κανονική έκφραση",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "Εγκατάσταση του '$stylename$' στο Stylus;",
 		"description": "Confirmation when installing a style",
@@ -208,38 +76,6 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Απενεργοποίηση",
 		"description": "Label for the button to disable a style"
@@ -248,10 +84,6 @@
 		"message": "Εμφάνιση αριθμού των στυλ που δραστηριοποιούνται για την τρέχουσα τοποθεσία στην μπάρα εργαλείων",
 		"description": "Label for the checkbox controlling toolbar badge text."
 	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
 	"menuShowBadge": {
 		"message": "Εμφάνιση ενεργους καταμέτρησης στυλ",
 		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
@@ -268,14 +100,6 @@
 		"message": "Έχετε κάνει αλλαγές σε αυτό το ύφος χωρίς αποθήκευση.",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "Αποτυχία ενημέρωσης: απρόσιτος διακομιστής.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
@@ -288,22 +112,10 @@
 		"message": "Εφαρμογή όλων των ενημερώσεων",
 		"description": "Label for the button to apply all detected updates"
 	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το στυλ;",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
 	"styleBadRegexp": {
 		"message": "Το Regexp δεν είναι έγκυρο.",
 		"description": "Validation message for a bad regexp in a style"
@@ -321,14 +133,6 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
 	"styleUpdate": {
 		"message": "Είστε σίγουροι ότι θέλετε να ενημερώσετε το '$stylename$';",
 		"description": "Confirmation when updating a style",
@@ -342,10 +146,6 @@
 		"message": "Ενότητες",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "Επεξεργασία του στυλ $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,30 +163,6 @@
 		"message": "Διευθύνσεις URL που αρχίζουν με",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
 	"popupStylesFirst": {
 		"message": "Στυλ λίστας πριν των εντολών στο μενού του κουμπιού γραμμής εργαλείων",
 		"description": "Label for the checkbox controlling section order in the popup."
@@ -407,14 +183,6 @@
 		"message": "Αφαίρεση",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
 	"manageTitle": {
 		"message": "Κομψή",
 		"description": "Title for the manage page"
@@ -423,26 +191,10 @@
 		"message": "Γράψτε νέο στυλ για:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "Ισχύει για",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Διαχείριση εγκατεστημένων στυλ",
 		"description": "Link to open the manage page."
@@ -464,34 +216,6 @@
 		"message": "Εγκατάσταση ενημέρωσης",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Αφαίρεση ενότητας",
 		"description": "Label for the button to remove a section"
@@ -500,18 +224,6 @@
 		"message": "Απενεργοποιηση ολων των στυλ",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Η ενημέρωση ολοκληρώθηκε.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +232,14 @@
 		"message": "Έλεγχος...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "Κώδικας",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
 	"cm_smartIndent": {
 		"message": "Χρήση έξυπνης εσοχής",
 		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Χρησιμοποιήστε το \"Ισχύει για\" έλεγχοι ώστε να περιοριστουν ποιες διευθύνσεις τον κώδικα σε αυτό το τμήμα να εφαρμόζονται.",
 		"description": "Help text for 'applies to' section"
@@ -568,174 +248,38 @@
 		"message": "Επεξεργασία Στυλ",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
 	"stylusUnavailableForURL": {
 		"message": "To Stylus δεν λειτουργεί σε σελίδες όπως αυτή.",
 		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Προσθήκη στυλ",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
 	"dbError": {
 		"message": "Παρουσιάστηκε σφάλμα χρησιμοποιώντας την κομψή βάση δεδομένων. Θα θέλατε να επισκεφθείτε μια ιστοσελίδα με πιθανές λύσεις;",
 		"description": "Prompt when a DB error is encountered"
 	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
 	"editGotoLine": {
 		"message": "Μετάβαση στη γραμμή (ή line:col)",
 		"description": "Go to line or line:column on Ctrl-G in style code editor"
 	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Έλεγχος όλων των στυλ για ενημερώσεις",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
 	"cm_indentWithTabs": {
 		"message": "Χρήση καρτελών με έξυπνη εσοχή",
 		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "Διαγραφή",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Γράψτε νέο στυλ",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
 	"manageOnlyEnabled": {
 		"message": "Μόνο ενεργοποιημένα στυλ",
 		"description": "Checkbox to show only enabled styles"
@@ -744,22 +288,6 @@
 		"message": "Επεξεργασία",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
 	"description": {
 		"message": "Επαναπροσδιορίση του διαδίκτυου με το  Stylus, έναν διαχειριστή στυλ. Το Stylus σας επιτρέπει να εγκαταστήσετε εύκολα themes και skins για πολλές δημοφιλείς ιστοσελίδες.",
 		"description": "Extension description"
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 9302d44a..e925e441 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -415,10 +415,6 @@
 		"message": "Estilo en formato Mozilla",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "Escribir estilo para:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
@@ -584,10 +580,6 @@
 		"message": "Sólo selección",
 		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
 	"updateAllCheckSucceededSomeEdited": {
 		"message": "No se buscaron actualizaciones de algunos estilos actualizables para evitar la pérdida de posibles ediciones locales. Se puede forzar la búsqueda de actualizaciones mediante comprobación individual, o ejecutando otra búsqueda para todos los estilos (las ediciones locales se sobrescribirán).",
 		"description": "Text that displays when an update all check completed and no updates are available"
@@ -680,10 +672,6 @@
 		"message": "Anchura del diálogo emergente (en píxeles)",
 		"description": ""
 	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
 	"undo": {
 		"message": "Deshacer",
 		"description": "Button label"
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index b953494f..3a751e01 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -3,46 +3,6 @@
 		"message": "Kaikki",
 		"description": "Text displayed for styles that apply to all sites"
 	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
-	},
 	"enableStyleLabel": {
 		"message": "Aktivoi",
 		"description": "Label for the button to enable a style"
@@ -51,14 +11,6 @@
 		"message": "Syötä nimi.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "URL ositteita domainilla",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,62 +19,14 @@
 		"message": "Hae päivityksiä",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
 	"updateAllCheckSucceededNoUpdate": {
 		"message": "All styles are up to date.",
 		"description": "Text that displays when an update all check completed and no updates are available"
 	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Apu",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
 	"findStylesForSite": {
 		"message": "Hae lisää tyylejä tälle sivustolle",
 		"description": "Text for a link that gets a list of styles for the current site"
@@ -131,14 +35,6 @@
 		"message": "Asennetut Tyylit",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Aktivoitu",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +47,10 @@
 		"message": "Lisää uusi osio",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Tallenna",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
-	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Lisää",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +59,6 @@
 		"message": "URL ositteet jotka vastaavat regexpiä",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "Asennetaanko '$stylename$' Stylusiin?",
 		"description": "Confirmation when installing a style",
@@ -208,38 +68,6 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Poista Käytöstä",
 		"description": "Label for the button to disable a style"
@@ -248,18 +76,6 @@
 		"message": "Show number of styles active for the current site on the toolbar button",
 		"description": "Label for the checkbox controlling toolbar badge text."
 	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
-	},
 	"styleCancelEditLabel": {
 		"message": "Takaisin hallintapaneeliin",
 		"description": "Label for cancel button for style editing"
@@ -268,50 +84,18 @@
 		"message": "Olet tehnyt muutoksia tähän tyyliin tallentamatta.",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "Päivitys epäonnistui: ei voitu yhdistää palvelimeen.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Oletko varma että haluat poistaa tämän tyylin?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
 	"styleBadRegexp": {
 		"message": "Regexp ei kelpaa.",
 		"description": "Validation message for a bad regexp in a style"
 	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
-	},
 	"appliesDisplay": {
 		"message": "Kooskee: $applies$",
 		"description": "Text on the manage screen to describe what the style applies to",
@@ -321,31 +105,10 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
 		"message": "Osiot",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "Muokkaa Tyyliä $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,30 +126,6 @@
 		"message": "URL osoitteet jotka alkavat",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
 	"popupStylesFirst": {
 		"message": "List styles before commands in the toolbar button menu",
 		"description": "Label for the checkbox controlling section order in the popup."
@@ -407,42 +146,14 @@
 		"message": "Poista",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
 	"manageTitle": {
 		"message": "Tyylikäs",
 		"description": "Title for the manage page"
 	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "Koskee",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Hallitse asennettuja tyylejä",
 		"description": "Link to open the manage page."
@@ -464,54 +175,10 @@
 		"message": "Asenna päivitys",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Poista osio",
 		"description": "Label for the button to remove a section"
 	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
-	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Päivitys suoritettu.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +187,10 @@
 		"message": "Tarkistetaan...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "Koodi",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
-	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Käytä 'Koskee' kontrolleja rajoittaaksesi mitä URL osoitteisiin tämä osio koodista koskee.",
 		"description": "Help text for 'applies to' section"
@@ -568,198 +199,26 @@
 		"message": "Muokkaa Tyyliä",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus doesn't work on pages like this.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Lisää Tyyli",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
-	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Tarkista kaikki tyylit päivityksien varalta",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "Poista",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Uusi Tyyli",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
-	},
 	"editStyleLabel": {
 		"message": "Muokkaa",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
 	"description": {
 		"message": "Uudelleen stailaa netti Stylusillä, käyttäjän tyyli hallintapaneelilla. Stylus antaa sinun helposti asentaa teemoja ja skinejä palvelluille kuten Google, Facebook, YouTube, Orkut, ja monelle, monelle muulle sivustolle.",
 		"description": "Extension description"
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 604a1214..892244cf 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -7,38 +7,10 @@
 		"message": "défaut",
 		"description": "Default CodeMirror CSS theme option on the edit style page"
 	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Exportez",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
 	"cm_tabSize": {
 		"message": "Taille des tabulations",
 		"description": "Label for the text box controlling tab size option for the style editor."
@@ -51,14 +23,6 @@
 		"message": "Veuillez saisir un nom.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "URL sur le domaine",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,58 +31,14 @@
 		"message": "Rechercher des mises à jour",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
 	"updateAllCheckSucceededNoUpdate": {
 		"message": "All styles are up to date.",
 		"description": "Text that displays when an update all check completed and no updates are available"
 	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Aide",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
 	"confirmYes": {
 		"message": "Oui",
 		"description": "'Yes' button in a confirm dialog"
@@ -131,14 +51,6 @@
 		"message": "Styles installés",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Activé",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +63,14 @@
 		"message": "Ajouter une section",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Enregistrer",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
 	"writeStyleForURL": {
 		"message": "cette URL",
 		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Ajouter",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +79,6 @@
 		"message": "URL correspondant à l'expression régulière",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "Installer \"$stylename$\" dans Stylus ?",
 		"description": "Confirmation when installing a style",
@@ -208,38 +88,6 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Désactiver",
 		"description": "Label for the button to disable a style"
@@ -248,14 +96,6 @@
 		"message": "Afficher le nombre de styles actifs pour le site actuel sur le boutton Stylus",
 		"description": "Label for the checkbox controlling toolbar badge text."
 	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
 	"cm_lineWrapping": {
 		"message": "Retour à la ligne automatique",
 		"description": "Label for the checkbox controlling word wrap option for the style editor."
@@ -268,14 +108,6 @@
 		"message": "Vous avez apporté des modifications à ce style sans les enregistrer.",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "Échec de la mise à jour: le serveur est inaccessible.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
@@ -284,34 +116,14 @@
 		"message": "Filtres",
 		"description": "Label for filters container"
 	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Voulez-vous vraiment supprimer ce style ?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
 	"styleBadRegexp": {
 		"message": "Le Regexp est éronné",
 		"description": "Validation message for a bad regexp in a style"
 	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
-	},
 	"appliesDisplay": {
 		"message": "S'applique à : $applies$",
 		"description": "Text on the manage screen to describe what the style applies to",
@@ -321,14 +133,6 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
 	"styleUpdate": {
 		"message": "Voulez-vous mettre à jour '$stylename$'?",
 		"description": "Confirmation when updating a style",
@@ -338,14 +142,6 @@
 			}
 		}
 	},
-	"styleSectionsTitle": {
-		"message": "Sections",
-		"description": "Title for the style sections section"
-	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "Modifier le style $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,30 +159,6 @@
 		"message": "URL commençant par",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
 	"popupStylesFirst": {
 		"message": "List styles before commands in the toolbar button menu",
 		"description": "Label for the checkbox controlling section order in the popup."
@@ -407,42 +179,10 @@
 		"message": "Supprimer",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "S'applique à",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Gérer les styles installés",
 		"description": "Link to open the manage page."
@@ -464,34 +204,6 @@
 		"message": "Installer la mise à jour",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Supprimer la section",
 		"description": "Label for the button to remove a section"
@@ -500,18 +212,6 @@
 		"message": "Désactiver tous les styles",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Mise à jour terminée.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +220,6 @@
 		"message": "Vérification en cours…",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
-	"sectionCode": {
-		"message": "Code",
-		"description": "Label for the code for a section"
-	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
-	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Utilisez l'option \"S'applique à\" pour préciser les URL auxquelles le code de cette section s'applique.",
 		"description": "Help text for 'applies to' section"
@@ -568,194 +228,38 @@
 		"message": "Modifier le style",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
 	"stylusUnavailableForURL": {
 		"message": "Stylus ne fonctionne pas sur les pages de ce genre",
 		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Ajouter un style",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
 	"dbError": {
 		"message": "Une erreur s'est produite dans la base de donnée de Stylus. Voulez-vous visiter une page web avec les solutions possibles ?",
 		"description": "Prompt when a DB error is encountered"
 	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
-	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Rechercher des mises à jour pour tous les styles",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
 	"confirmNo": {
 		"message": "Non",
 		"description": "'No' button in a confirm dialog"
 	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "Supprimer",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Créer un nouveau style",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
-	},
 	"editStyleLabel": {
 		"message": "Modifier",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
 	"helpKeyMapCommand": {
 		"message": "Tapez un nom de commande",
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index c7169210..e1a6f6a4 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -3,46 +3,6 @@
 		"message": "Tutto",
 		"description": "Text displayed for styles that apply to all sites"
 	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
-	},
 	"enableStyleLabel": {
 		"message": "Attiva",
 		"description": "Label for the button to enable a style"
@@ -51,14 +11,6 @@
 		"message": "Inserisci un nome.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "URL nel dominio",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,62 +19,10 @@
 		"message": "Verifica la presenza di aggiornamenti",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "No updates found.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Guida",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
 	"findStylesForSite": {
 		"message": "Trova più stili per questo sito",
 		"description": "Text for a link that gets a list of styles for the current site"
@@ -131,14 +31,6 @@
 		"message": "Stili installati",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Attivato",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +43,10 @@
 		"message": "Aggiungi un'altra sezione",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Salva",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
-	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Aggiungi",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +55,6 @@
 		"message": "URL corrispondenti all'espressione regolare",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "Installare \"$stylename$\" in Stylus?",
 		"description": "Confirmation when installing a style",
@@ -208,58 +64,10 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Disattiva",
 		"description": "Label for the button to disable a style"
 	},
-	"prefShowBadge": {
-		"message": "Number of styles active for the current site",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
-	},
 	"styleCancelEditLabel": {
 		"message": "Torna a gestione",
 		"description": "Label for cancel button for style editing"
@@ -268,50 +76,14 @@
 		"message": "Hai apportato modifiche a questo stile senza salvare.",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "Aggiornamento non riuscito: server non raggiungibile.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Vuoi eliminare questo stile?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
-	},
 	"appliesDisplay": {
 		"message": "Applica a: $applies$",
 		"description": "Text on the manage screen to describe what the style applies to",
@@ -321,31 +93,10 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
 		"message": "Sezioni",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "Modifica dello stile $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,34 +114,6 @@
 		"message": "URL che iniziano con",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
-	"popupStylesFirst": {
-		"message": "Styles before commands",
-		"description": "Label for the checkbox controlling section order in the popup."
-	},
 	"sectionHelp": {
 		"message": "Le sezioni consentono di definire diverse parti di codice da applicare a diversi insiemi di URL dello stesso stile. Ad esempio, un unico stile potrebbe modificare la home page di un sito diversamente da come modificherebbe il resto del sito.",
 		"description": "Help text for sections"
@@ -407,42 +130,10 @@
 		"message": "Rimuovi",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "Vale per",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Gestisci gli stili installati",
 		"description": "Link to open the manage page."
@@ -464,54 +155,10 @@
 		"message": "Installa aggiornamento",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Rimuovi sezione",
 		"description": "Label for the button to remove a section"
 	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
-	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Aggiornamento completato.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +167,10 @@
 		"message": "Verifica in corso...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "Codice",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
-	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Utilizza i controlli \"Applica a\" per limitare gli URL a cui viene applicato il codice in questa sezione.",
 		"description": "Help text for 'applies to' section"
@@ -568,198 +179,26 @@
 		"message": "Modifica di stili",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus doesn't work on pages like this.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Aggiunta di stili",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
-	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Verifica la disponibilità di aggiornamenti per tutti gli stili",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "Elimina",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Scrivi nuovo stile",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
-	},
 	"editStyleLabel": {
 		"message": "Modifica",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
 	"description": {
 		"message": "Modifica lo stile del Web con Stylus, un gestore di stili utente. Stylus consente di installare facilmente temi e skin per Google, Facebook, YouTube, Orkut e moltissimi altri siti.",
 		"description": "Extension description"
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index 168fcec7..e01bad4a 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -27,10 +27,6 @@
 		"message": "エクスポート",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
 	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
 	"optionsBadgeNormal": {
 		"message": "背景色",
 		"description": ""
@@ -67,18 +63,6 @@
 		"message": "アップデートをチェック",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
 	"importAppendLabel": {
 		"message": "スタイルに追加",
 		"description": "Label for the button to import a style and append to the existing sections"
@@ -91,10 +75,6 @@
 		"message": "更新は見つかりませんでした。",
 		"description": "Text that displays when an update all check completed and no updates are available"
 	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
 	"styleFromMozillaFormatPrompt": {
 		"message": "Mozilla形式のコードを貼り付ける",
 		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
@@ -107,10 +87,6 @@
 		"message": "ヘルプ",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
 	"search": {
 		"message": "検索",
 		"description": "Label before the search input field in the editor shown on Ctrl-F"
@@ -131,14 +107,6 @@
 		"message": "インストール済みのスタイル",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "有効",
 		"description": "Label for the enabled state of styles"
@@ -151,10 +119,6 @@
 		"message": "他のセクションを追加",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "保存",
 		"description": "Label for save button for style editing"
@@ -175,10 +139,6 @@
 		"message": "中止",
 		"description": "'Stop' button in a confirm dialog"
 	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
-	},
 	"optionsSubheading": {
 		"message": "その他のオプション",
 		"description": "Subheading for options section on manage page."
@@ -191,10 +151,6 @@
 		"message": "正規表現に一致する URL",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
 	"importReportLegendUpdatedCode": {
 		"message": "コードを更新",
 		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
@@ -232,10 +188,6 @@
 		"message": "旧バージョンまたはStylishからスタイルバックアップをインポートする場合は、スタイルマネージャで手動で更新を一度チェックして、すべてのスタイルが確実に更新されるようにします。",
 		"description": ""
 	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
 	"unreachableFileHint": {
 		"message": "Stylusはchrome://extensionsページのStylus拡張機能に対応するチェックボックスを有効にした場合にのみ、file:// URLにアクセスできます。",
 		"description": "Note in the toolbar popup for file:// URLs"
@@ -321,10 +273,6 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
 	"openStylesManager": {
 		"message": "スタイルマネージャーを開く",
 		"description": "Label for the style maanger opener in the browser action context menu."
@@ -342,10 +290,6 @@
 		"message": "セクション",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "スタイル「$stylename$」を編集",
 		"description": "Title of the page for editing styles",
@@ -383,10 +327,6 @@
 		"message": "現在のスタイルの内容を破棄し、インポートされたスタイルで上書きする",
 		"description": "Label for the button to import and overwrite current style"
 	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
 	"popupStylesFirst": {
 		"message": "スタイルをコマンドボタンの前に",
 		"description": "Label for the checkbox controlling section order in the popup."
@@ -407,18 +347,10 @@
 		"message": "削除",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
 	"styleToMozillaFormatTitle": {
 		"message": "Mozilla形式のスタイル",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "次のスタイルを書く:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
@@ -427,14 +359,6 @@
 		"message": "置換",
 		"description": "Label before the replace input field in the editor shown on Ctrl-H"
 	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "適用先",
 		"description": "Label for 'applies to' fields on the edit/add screen"
@@ -472,22 +396,10 @@
 		"message": "スタイルのインポートが終了しました",
 		"description": "Title of the report shown after importing styles"
 	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
 	"cm_matchHighlight": {
 		"message": "ハイライト",
 		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
 	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
 	"unreachableContentScript": {
 		"message": "ページと通信できませんでした。タブを再読み込みしてみてください。",
 		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
@@ -508,10 +420,6 @@
 		"message": "すべてのセクションで元に戻す",
 		"description": "CSS-beautify global Undo button label"
 	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "更新が完了しました",
 		"description": "Text that displays when an update completed"
@@ -520,10 +428,6 @@
 		"message": "チェック中...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
 	"manageMaxTargets": {
 		"message": "適用先アイテムの数",
 		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
@@ -548,18 +452,10 @@
 		"message": "エディタのコンテキストメニューに「削除」を追加",
 		"description": ""
 	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
 	"cm_smartIndent": {
 		"message": "スマートインデントを使用する",
 		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "[適用先] を使用すると、このセクションのコードが適用される URL を制限することができます。",
 		"description": "Help text for 'applies to' section"
@@ -572,10 +468,6 @@
 		"message": "削除",
 		"description": "Label for the context menu item in the editor to delete selected text"
 	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
 	"stylusUnavailableForURLdetails": {
 		"message": "セキュリティ上の予防措置として、ブラウザは拡張機能が他の拡張機能のページと同様に、内蔵のページ（chrome://versionやabout:addonsなど）に影響を及ぼさないようにします。各ブラウザは、独自の拡張機能ギャラリー（ChromeウェブストアやAMOなど）へのアクセスも制限しています。",
 		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
@@ -584,10 +476,6 @@
 		"message": "選択した単語のみ",
 		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
 	"updateAllCheckSucceededSomeEdited": {
 		"message": "可能なローカル編集を失うのを避けるために、更新可能なスタイルがチェックされていませんでした。更新を強制的に行うには、個別にチェックするか、すべてのスタイルに対して別のチェックを実行します（ローカル編集は上書きされます）。",
 		"description": "Text that displays when an update all check completed and no updates are available"
@@ -608,10 +496,6 @@
 		"message": "スタイルを上書き",
 		"description": "Label for the button to import and overwrite current style"
 	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
 	"optionsAdvanced": {
 		"message": "上級者向け",
 		"description": ""
@@ -632,22 +516,10 @@
 		"message": "ホットキーを押す",
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
 	"replaceAll": {
 		"message": "すべて置換",
 		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
 	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
 	"editGotoLine": {
 		"message": "行（または行:列）に移動",
 		"description": "Go to line or line:column on Ctrl-G in style code editor"
@@ -672,10 +544,6 @@
 		"message": "ツールバーアイコンのバッジ",
 		"description": ""
 	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
 	"optionsPopupWidth": {
 		"message": "ポップアップの幅 (ピクセル単位)",
 		"description": ""
@@ -716,14 +584,6 @@
 		"message": "削除",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "新しいスタイルを作成",
 		"description": "Label for the button to go to the add style page"
@@ -752,10 +612,6 @@
 		"message": "ファイルを選択するか、このページにドラッグ＆ドロップします。",
 		"description": "Message for backup"
 	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
 	"helpKeyMapCommand": {
 		"message": "コマンド名を入力",
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index 48795942..0f06ade9 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -7,22 +7,6 @@
 		"message": "standaard",
 		"description": "Default CodeMirror CSS theme option on the edit style page"
 	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Exporteren",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
@@ -31,14 +15,6 @@
 		"message": "Problemen",
 		"description": "Label for the CSSLint issues block on the style edit page"
 	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
 	"cm_tabSize": {
 		"message": "Tabgrootte",
 		"description": "Label for the text box controlling tab size option for the style editor."
@@ -51,14 +27,6 @@
 		"message": "Vul een naam in.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "URL's op het domein",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,58 +35,26 @@
 		"message": "Controleren op update",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
 	"importAppendLabel": {
 		"message": "Toevoegen aan stijl",
 		"description": "Label for the button to import a style and append to the existing sections"
 	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
 	"updateAllCheckSucceededNoUpdate": {
 		"message": "Alle stijlen zijn bijgewerkt.",
 		"description": "Text that displays when an update all check completed and no updates are available"
 	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
 	"styleFromMozillaFormatPrompt": {
 		"message": "Plak de Mozilla-opmaakcode",
 		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
 	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Hul",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
 	"search": {
 		"message": "Zoeken",
 		"description": "Label before the search input field in the editor shown on Ctrl-F"
 	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
 	"confirmYes": {
 		"message": "Ja",
 		"description": "'Yes' button in a confirm dialog"
@@ -135,10 +71,6 @@
 		"message": "Mooier maken",
 		"description": "Label for the CSS-beautifier button on the edit style page"
 	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Ingeschakeld",
 		"description": "Label for the enabled state of styles"
@@ -151,26 +83,10 @@
 		"message": "Nog een sectie toevoegen",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Opslaan",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
 	"confirmStop": {
 		"message": "Stoppen",
 		"description": "'Stop' button in a confirm dialog"
@@ -179,10 +95,6 @@
 		"message": "deze URL",
 		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Toevoegen",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +103,6 @@
 		"message": "URL's overeenkomend met de regexp",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "'$stylename$' installeren in Stylus?",
 		"description": "Confirmation when installing a style",
@@ -208,38 +112,14 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
 	"manageText": {
 		"message": "<a href='https://userstyles.org'>Verkrijg stijlen op userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Verkrijg hulp</a>",
 		"description": "Help text on the manage page"
 	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"searchStyles": {
 		"message": "Inhoud doorzoeken",
 		"description": "Label for the search filter textbox on the Manage styles page"
 	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Uitschakelen",
 		"description": "Label for the button to disable a style"
@@ -248,10 +128,6 @@
 		"message": "Aantal actieve stijlen voor de huidige website weergeven op de werkbalkknop",
 		"description": "Label for the checkbox controlling toolbar badge text."
 	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
 	"menuShowBadge": {
 		"message": "Teller voor actieve stijlen weergeven",
 		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
@@ -272,38 +148,18 @@
 		"message": "Importeren",
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "Update mislukt: server onbereikbaar.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
 	"applyAllUpdates": {
 		"message": "Alle bijwerkingen toepassen",
 		"description": "Label for the button to apply all detected updates"
 	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Weet u zeker dat u deze stijl wilt verwijderen?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
 	"styleBadRegexp": {
 		"message": "Regexp is ongeldig.",
 		"description": "Validation message for a bad regexp in a style"
@@ -321,14 +177,6 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
 	"styleUpdate": {
 		"message": "Weet u zeker dat u '$stylename$' wilt updaten?",
 		"description": "Confirmation when updating a style",
@@ -342,10 +190,6 @@
 		"message": "Secties",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "Stijl $stylename$ bewerken",
 		"description": "Title of the page for editing styles",
@@ -363,30 +207,14 @@
 		"message": "URL's beginnend met",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
 	"searchRegexp": {
 		"message": "Gebruik /re/-syntax voor regexp-zoeken",
 		"description": "Label after the search input field in the editor shown on Ctrl-F"
 	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
 	"importReplaceTooltip": {
 		"message": "Verwerp de inhoud van de huidige stijl en overschrijf het met de geïmporteerde stijl",
 		"description": "Label for the button to import and overwrite current style"
 	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
 	"popupStylesFirst": {
 		"message": "Stijlen vóór commando's opsomming in het werkbalkknopmenu",
 		"description": "Label for the checkbox controlling section order in the popup."
@@ -407,18 +235,10 @@
 		"message": "Verwijderen",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
 	"styleToMozillaFormatTitle": {
 		"message": "Stijl in Mozilla-opmaak",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "Stijl schrijven voor:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
@@ -427,22 +247,10 @@
 		"message": "Vervangen",
 		"description": "Label before the replace input field in the editor shown on Ctrl-H"
 	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "Toepasbaar op",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Geïnstalleerde stijlen beheren",
 		"description": "Link to open the manage page."
@@ -464,34 +272,10 @@
 		"message": "Update installeren",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
 	"styleMozillaFormatHeading": {
 		"message": "Mozilla-opmaak",
 		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Sectie verwijderen",
 		"description": "Label for the button to remove a section"
@@ -500,18 +284,10 @@
 		"message": "Alle stijlen uitschakelen",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
 	"undoGlobal": {
 		"message": "Ongedaan maken (globaal)",
 		"description": "CSS-beautify global Undo button label"
 	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Update voltooid.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +296,10 @@
 		"message": "Bezig met controleren...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
-	"sectionCode": {
-		"message": "Code",
-		"description": "Label for the code for a section"
-	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
 	"cm_smartIndent": {
 		"message": "Slimme inspringing gebruiken",
 		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Gebruik de 'Toepasbaar op'-functies om de URL's te limiteren in de sectie.",
 		"description": "Help text for 'applies to' section"
@@ -568,38 +308,10 @@
 		"message": "Stijl bewerken",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
 	"stylusUnavailableForURL": {
 		"message": "Stylus werkt niet op pagina's als deze.",
 		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Stijl toevoegen",
 		"description": "Title of the page for adding styles"
@@ -612,74 +324,30 @@
 		"message": "Er is een fout opgetreden bij het gebruiken van de Stylus-database. Wilt u een webpagina met mogelijke oplossingen bezoeken?",
 		"description": "Prompt when a DB error is encountered"
 	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
 	"importAppendTooltip": {
 		"message": "Voeg de geïmporteerde stijl toe aan de huidige stijl",
 		"description": "Tooltip for the button to import a style and append to the existing sections"
 	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
 	"helpKeyMapHotkey": {
 		"message": "Druk op een sneltoets",
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
 	"replaceAll": {
 		"message": "Alles vervangen",
 		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
 	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
 	"editGotoLine": {
 		"message": "Ga naar regel (of regel:kolom)",
 		"description": "Go to line or line:column on Ctrl-G in style code editor"
 	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Controleer alle stijlen op updates",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
 	"issuesHelp": {
 		"message": "De door CSSLint gevonden problemen, <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a>, met deze ingeschakelde regels:",
 		"description": "Help popup message for the CSSLint issues block on the style edit page"
 	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
 	"confirmNo": {
 		"message": "Nee",
 		"description": "'No' button in a confirm dialog"
@@ -692,18 +360,6 @@
 		"message": "Toetsenbordindeling",
 		"description": "Label for the drop-down list controlling the keymap for the style editor."
 	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
 	"cm_indentWithTabs": {
 		"message": "Tabs met slimme inspringing gebruiken",
 		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
@@ -716,26 +372,10 @@
 		"message": "Verwijderen",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Nieuwe stijl schrijven",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
 	"manageOnlyEnabled": {
 		"message": "Alleen ingeschakelde stijlen",
 		"description": "Checkbox to show only enabled styles"
@@ -748,14 +388,6 @@
 		"message": "Thema",
 		"description": "Label for the style editor's CSS theme."
 	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
 	"helpKeyMapCommand": {
 		"message": "Voer een naam in voor het commando",
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index d42a411d..ce98da46 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -3,46 +3,6 @@
 		"message": "Tudo",
 		"description": "Text displayed for styles that apply to all sites"
 	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
-	},
 	"enableStyleLabel": {
 		"message": "Ativar",
 		"description": "Label for the button to enable a style"
@@ -51,14 +11,6 @@
 		"message": "Insira um nome.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "URLs no domínio",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,62 +19,10 @@
 		"message": "Verificar atualizações",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "No updates found.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Ajuda",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
 	"findStylesForSite": {
 		"message": "Procurar mais estilos para este site",
 		"description": "Text for a link that gets a list of styles for the current site"
@@ -131,14 +31,6 @@
 		"message": "Estilos instalados",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Ativado",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +43,10 @@
 		"message": "Adicionar outra seção",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Salvar",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
-	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Adicionar",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +55,6 @@
 		"message": "URLs que correspondem a regexp",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "Instalar \"$stylename$\" no Stylus?",
 		"description": "Confirmation when installing a style",
@@ -208,38 +64,6 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Desativar",
 		"description": "Label for the button to disable a style"
@@ -248,18 +72,6 @@
 		"message": "Show number of styles active for the current site on the toolbar button",
 		"description": "Label for the checkbox controlling toolbar badge text."
 	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
-	},
 	"styleCancelEditLabel": {
 		"message": "Voltar ao gerenciamento",
 		"description": "Label for cancel button for style editing"
@@ -268,50 +80,14 @@
 		"message": "Você fez alterações neste estilo sem salvar.",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "A atualização falhou: servidor inacessível.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Tem certeza de que deseja excluir este estilo?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
-	},
 	"appliesDisplay": {
 		"message": "Aplica-se a: $applies$",
 		"description": "Text on the manage screen to describe what the style applies to",
@@ -321,31 +97,10 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
 		"message": "Seções",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "Editar estilo $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,34 +118,6 @@
 		"message": "URLs que começam com",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
-	"popupStylesFirst": {
-		"message": "Styles before commands",
-		"description": "Label for the checkbox controlling section order in the popup."
-	},
 	"sectionHelp": {
 		"message": "As seções permitem definir diferentes partes de código para aplicar a diferentes conjuntos de URLs no mesmo estilo. Por exemplo, um único estilo poderia alterar a página inicial de um site de uma forma, enquanto alteraria o resto do site de outra forma.",
 		"description": "Help text for sections"
@@ -407,42 +134,10 @@
 		"message": "Remover",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "Aplica-se a",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Gerenciar estilos instalados",
 		"description": "Link to open the manage page."
@@ -464,54 +159,10 @@
 		"message": "Instalar atualização",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Remover seção",
 		"description": "Label for the button to remove a section"
 	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
-	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Atualização concluída.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +171,10 @@
 		"message": "Verificando...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "Código",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
-	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Use os controles \"Aplica-se a\" para limitar a quais URLs o código desta seção se aplica.",
 		"description": "Help text for 'applies to' section"
@@ -568,198 +183,26 @@
 		"message": "Editar estilo",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus doesn't work on pages like this.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Adicionar estilo",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
-	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Verificar atualizações para todos os estilos",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "Excluir",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Gravar novo estilo",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
-	},
 	"editStyleLabel": {
 		"message": "Editar",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
 	"description": {
 		"message": "Mude o estilo da web com o Stylus, um gerenciador de estilos do usuário. O Stylus permite instalar facilmente temas e skins para Google, Facebook, YouTube, Orkut e muitos, muitos outros sites.",
 		"description": "Extension description"
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index 5fb8ad26..157fda85 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -415,10 +415,6 @@
 		"message": "Стиль в формате Mozilla",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "Создать стиль для:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
@@ -584,10 +580,6 @@
 		"message": "Выделенный текст",
 		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
 	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
 	"updateAllCheckSucceededSomeEdited": {
 		"message": "Не все стили были проверены, чтобы не потерять возможные локальные изменения. Форсировать обновление стиля можно индивидуально или запустив перепроверку всех обновляемых стилей (локальные изменения будут утеряны).",
 		"description": "Text that displays when an update all check completed and no updates are available"
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index 2cfabf6b..b55e7ad9 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -7,22 +7,6 @@
 		"message": "подразумевано",
 		"description": "Default CodeMirror CSS theme option on the edit style page"
 	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Извези",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
@@ -31,14 +15,6 @@
 		"message": "Проблеми",
 		"description": "Label for the CSSLint issues block on the style edit page"
 	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
 	"cm_tabSize": {
 		"message": "Величина картице",
 		"description": "Label for the text box controlling tab size option for the style editor."
@@ -51,14 +27,6 @@
 		"message": "Унесите назив",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "УРЛ адресе на домену",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,58 +35,26 @@
 		"message": "Проверите ажурирање",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
 	"importAppendLabel": {
 		"message": "Додај стилу",
 		"description": "Label for the button to import a style and append to the existing sections"
 	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
 	"updateAllCheckSucceededNoUpdate": {
 		"message": "Сви стилови су ажурирани.",
 		"description": "Text that displays when an update all check completed and no updates are available"
 	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
 	"styleFromMozillaFormatPrompt": {
 		"message": "Налепи код у Mozilla формату",
 		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
 	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Помоћ",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
 	"search": {
 		"message": "Претражи",
 		"description": "Label before the search input field in the editor shown on Ctrl-F"
 	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
 	"confirmYes": {
 		"message": "Да",
 		"description": "'Yes' button in a confirm dialog"
@@ -135,10 +71,6 @@
 		"message": "Улепшај",
 		"description": "Label for the CSS-beautifier button on the edit style page"
 	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Омогућено",
 		"description": "Label for the enabled state of styles"
@@ -151,26 +83,10 @@
 		"message": "Додај нови одељак",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Сачувај",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
 	"confirmStop": {
 		"message": "Заустави",
 		"description": "'Stop' button in a confirm dialog"
@@ -179,10 +95,6 @@
 		"message": "ову УРЛ адресу",
 		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Додај",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +103,6 @@
 		"message": "УРЛ адресе које одговарају регуларном изразу",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "Инсталирати '$stylename$' у Stylus?",
 		"description": "Confirmation when installing a style",
@@ -208,38 +112,14 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
 	"manageText": {
 		"message": "<a href='https://userstyles.org'>Преузмите стилове са userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Помоћ</a>",
 		"description": "Help text on the manage page"
 	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"searchStyles": {
 		"message": "Претражи садржај",
 		"description": "Label for the search filter textbox on the Manage styles page"
 	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Онемогући",
 		"description": "Label for the button to disable a style"
@@ -248,10 +128,6 @@
 		"message": "Прикажи број активних стилова за тренутни сајт на дугмету на алатној траци",
 		"description": "Label for the checkbox controlling toolbar badge text."
 	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
 	"menuShowBadge": {
 		"message": "Прикажи број активних стилова",
 		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
@@ -272,10 +148,6 @@
 		"message": "Увези",
 		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
 	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "Ажурирање није успело: сервер није доступан.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
@@ -288,22 +160,10 @@
 		"message": "Примени сва ажурирања",
 		"description": "Label for the button to apply all detected updates"
 	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Да ли сте сигурни да желите да избришете овај стил?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
 	"styleBadRegexp": {
 		"message": "Регуларни израз је неисправан.",
 		"description": "Validation message for a bad regexp in a style"
@@ -321,14 +181,6 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
 	"styleUpdate": {
 		"message": "Да ли сте сигурни да желите да ажурирате '$stylename$'?",
 		"description": "Confirmation when updating a style",
@@ -342,10 +194,6 @@
 		"message": "Одељци",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "Уреди стил $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,30 +211,14 @@
 		"message": "УРЛ адресе које почињу са",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
 	"searchRegexp": {
 		"message": "Користи /re/ синтаксу за претрагу  регуларним изразом",
 		"description": "Label after the search input field in the editor shown on Ctrl-F"
 	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
 	"importReplaceTooltip": {
 		"message": "Одбаци садржај тренутног стила и упиши преко њега увезени стил",
 		"description": "Label for the button to import and overwrite current style"
 	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
 	"popupStylesFirst": {
 		"message": "Излистај стилове пре команди у менију дугмета на алатној траци",
 		"description": "Label for the checkbox controlling section order in the popup."
@@ -407,18 +239,10 @@
 		"message": "Уклони",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
 	"styleToMozillaFormatTitle": {
 		"message": "Стил у Mozilla формату",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "Упиши стил за:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
@@ -427,22 +251,10 @@
 		"message": "Замени",
 		"description": "Label before the replace input field in the editor shown on Ctrl-H"
 	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "Примењује се на",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Управљај инсталираним стиловима",
 		"description": "Link to open the manage page."
@@ -464,34 +276,10 @@
 		"message": "Инсталирај ажурирање",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
 	"styleMozillaFormatHeading": {
 		"message": "Mozilla формат",
 		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
 	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Уклони одељак",
 		"description": "Label for the button to remove a section"
@@ -500,18 +288,10 @@
 		"message": "Искључи све стилове",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
 	"undoGlobal": {
 		"message": "Опозови (свеобухватно)",
 		"description": "CSS-beautify global Undo button label"
 	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Ажурирање је комплетирано.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +300,14 @@
 		"message": "Проверавање...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "Код",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
 	"cm_smartIndent": {
 		"message": "Користи паметно увлачење редова",
 		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Употреба 'Примењује се на' одређује опсег УРЛ адреса на које се код у овом одељку примењује.",
 		"description": "Help text for 'applies to' section"
@@ -568,38 +316,14 @@
 		"message": "Уреди стил",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
 	"appliesUrlOption": {
 		"message": "УРЛ",
 		"description": "Option to make the style apply to the entered string as a URL"
 	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
 	"stylusUnavailableForURL": {
 		"message": "Stylus не ради на страницама као што је ова.",
 		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Додај стил",
 		"description": "Title of the page for adding styles"
@@ -612,74 +336,30 @@
 		"message": "Дошло је до грешке користећи Stylus базу података. Да ли желите да посетите веб страницу са могућим решењима?",
 		"description": "Prompt when a DB error is encountered"
 	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
 	"importAppendTooltip": {
 		"message": "Додај увезени стил тренутном стилу",
 		"description": "Tooltip for the button to import a style and append to the existing sections"
 	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
 	"helpKeyMapHotkey": {
 		"message": "Притисни пречицу",
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
 	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
 	"replaceAll": {
 		"message": "Замени све",
 		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
 	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
 	"editGotoLine": {
 		"message": "Иди на ред (или line:col)",
 		"description": "Go to line or line:column on Ctrl-G in style code editor"
 	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Проверите ажурирања за све стилове",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
 	"issuesHelp": {
 		"message": "Проблем пронађен од стране <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> са овим омогућеним правилима:",
 		"description": "Help popup message for the CSSLint issues block on the style edit page"
 	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
 	"confirmNo": {
 		"message": "Не",
 		"description": "'No' button in a confirm dialog"
@@ -692,18 +372,6 @@
 		"message": "Мапа тастера",
 		"description": "Label for the drop-down list controlling the keymap for the style editor."
 	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
 	"cm_indentWithTabs": {
 		"message": "Користи картице са паметним увлачењем редова",
 		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
@@ -716,26 +384,10 @@
 		"message": "Избриши",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Упиши нови стил",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
 	"manageOnlyEnabled": {
 		"message": "Само омогућени стилови",
 		"description": "Checkbox to show only enabled styles"
@@ -748,14 +400,6 @@
 		"message": "Тема",
 		"description": "Label for the style editor's CSS theme."
 	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
 	"helpKeyMapCommand": {
 		"message": "Укуцај име команде",
 		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index fd56a903..b42e3c2c 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -3,42 +3,6 @@
 		"message": "Allt",
 		"description": "Text displayed for styles that apply to all sites"
 	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
 	"cm_tabSize": {
 		"message": "Flikstorlek",
 		"description": "Label for the text box controlling tab size option for the style editor."
@@ -51,14 +15,6 @@
 		"message": "Ange ett namn.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "URL:er på domänen",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,62 +23,14 @@
 		"message": "Leta efter uppdatering",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
 	"updateAllCheckSucceededNoUpdate": {
 		"message": "Alla stilar är fullt uppdaterade.",
 		"description": "Text that displays when an update all check completed and no updates are available"
 	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Hjälp",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
 	"findStylesForSite": {
 		"message": "Hitta fler stilar för denna sida",
 		"description": "Text for a link that gets a list of styles for the current site"
@@ -131,14 +39,6 @@
 		"message": "Installerade Stilar",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Aktiverad",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +51,14 @@
 		"message": "Lägg till ytterligare en sektion",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Spara",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
 	"writeStyleForURL": {
 		"message": "denna URL",
 		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
 	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Lägg till",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +67,6 @@
 		"message": "URL:er som matchar regexp:en",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "Installera '$stylename$' in i Stylus?",
 		"description": "Confirmation when installing a style",
@@ -208,38 +76,6 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Inaktivera",
 		"description": "Label for the button to disable a style"
@@ -248,10 +84,6 @@
 		"message": "Visa antalet aktiva stilar för den nuvarande sidan på verktygsfältsikonen",
 		"description": "Label for the checkbox controlling toolbar badge text."
 	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
 	"menuShowBadge": {
 		"message": "Visa antalet aktiva stilar",
 		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
@@ -268,14 +100,6 @@
 		"message": "Du har gjort ändringar i denna stil utan att spara.",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "Uppdateringen misslyckades: server onåbar.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
@@ -288,22 +112,10 @@
 		"message": "Verkställ alla uppdateringar",
 		"description": "Label for the button to apply all detected updates"
 	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Är du säker på att du vill ta bort denna stil?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
 	"styleBadRegexp": {
 		"message": "Regexp:en är ogiltig",
 		"description": "Validation message for a bad regexp in a style"
@@ -321,14 +133,6 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
 	"styleUpdate": {
 		"message": "Är du säker på att du vill uppdatera '$stylename$'?",
 		"description": "Confirmation when updating a style",
@@ -342,10 +146,6 @@
 		"message": "Sektioner",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "Ändra i Stil $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,30 +163,6 @@
 		"message": "URL:er som börjar på",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
 	"popupStylesFirst": {
 		"message": "Lista stilar före kommandon i verktygsfältets knappmeny",
 		"description": "Label for the checkbox controlling section order in the popup."
@@ -407,14 +183,6 @@
 		"message": "Ta bort",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
 	"manageTitle": {
 		"message": "Tyylikäs",
 		"description": "Title for the manage page"
@@ -423,26 +191,10 @@
 		"message": "Skriv stil för:",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
 	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "Gäller för",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Hantera installerade stilar",
 		"description": "Link to open the manage page."
@@ -464,34 +216,6 @@
 		"message": "Installera uppdatering",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Ta bort sektion",
 		"description": "Label for the button to remove a section"
@@ -500,18 +224,6 @@
 		"message": "Stäng av alla stilar",
 		"description": "Label for the checkbox that turns all enabled styles off."
 	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Uppdatering slutförd.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +232,14 @@
 		"message": "Letar...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "Kod",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
 	"cm_smartIndent": {
 		"message": "Använd smart indrag",
 		"description": "Label for the checkbox controlling smart indentation option for the style editor."
 	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Använd 'Gäller för' alternativet för att begränsa vilka URL:er koden i denna sektion gäller för.",
 		"description": "Help text for 'applies to' section"
@@ -568,174 +248,42 @@
 		"message": "Ändra i Stil",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
 	"stylusUnavailableForURL": {
 		"message": "Stylus fungerar inte på sidor som denna.",
 		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
 	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Lägg till stil",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
 	"dbError": {
 		"message": "Ett fel inträffades vid hanteringen av Stylus-databasen. Skulle du vilja besöka en sida med eventuella lösningar?",
 		"description": "Prompt when a DB error is encountered"
 	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
 	"editGotoLine": {
 		"message": "Gå till rad (eller rad:kol)",
 		"description": "Go to line or line:column on Ctrl-G in style code editor"
 	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Leta igenom alla stilar efter uppdateringar",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
 	"cm_keyMap": {
 		"message": "Nyckelkarta",
 		"description": "Label for the drop-down list controlling the keymap for the style editor."
 	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
 	"cm_indentWithTabs": {
 		"message": "Använd flikar med smart indrag",
 		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
 	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "Ta bort",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Skriv ny stil",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
 	"manageOnlyEnabled": {
 		"message": "Endast aktiverade stilar",
 		"description": "Checkbox to show only enabled styles"
@@ -744,22 +292,6 @@
 		"message": "Ändra",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
 	"description": {
 		"message": "Style:a om webben med Stylus, en användarstils-hanterare. Stylus låter dig enkelt installera teman och skal för många populära sidor.",
 		"description": "Extension description"
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index dd93888f..b9b565d1 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -3,46 +3,6 @@
 		"message": "Her şey",
 		"description": "Text displayed for styles that apply to all sites"
 	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
-	},
 	"enableStyleLabel": {
 		"message": "Etkinleştir",
 		"description": "Label for the button to enable a style"
@@ -51,14 +11,6 @@
 		"message": "Bir ad girin.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "Alan adındaki URLler",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,62 +19,10 @@
 		"message": "Güncellemeleri denetle",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "No updates found.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "Yardım",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
 	"findStylesForSite": {
 		"message": "Bu site için başka stiller bul",
 		"description": "Text for a link that gets a list of styles for the current site"
@@ -131,14 +31,6 @@
 		"message": "Yüklü Stiller",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "Etkin",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +43,10 @@
 		"message": "Başka bölüm ekle",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "Kaydet",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
-	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "Ekleyin",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +55,6 @@
 		"message": "regexp ile eşleşen URL'ler",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "'$stylename$' Stylus'e yüklensin mi?",
 		"description": "Confirmation when installing a style",
@@ -208,58 +64,10 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "Devre dışı bırak",
 		"description": "Label for the button to disable a style"
 	},
-	"prefShowBadge": {
-		"message": "Number of styles active for the current site",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
-	},
 	"styleCancelEditLabel": {
 		"message": "Yönetim sayfasına dön",
 		"description": "Label for cancel button for style editing"
@@ -268,50 +76,14 @@
 		"message": "Bu stilde yaptığınız, kaydedilmemiş değişiklikler var.",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "Güncellenemedi: sunucuya erişilemiyor.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "Bu stili silmek istediğinizden emin misiniz?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
-	},
 	"appliesDisplay": {
 		"message": "Şuraya uygulanır: $applies$",
 		"description": "Text on the manage screen to describe what the style applies to",
@@ -321,31 +93,10 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
-	"styleUpdate": {
-		"message": "Are you sure you want to update '$stylename$'?",
-		"description": "Confirmation when updating a style",
-		"placeholders": {
-			"stylename": {
-				"content": "$1"
-			}
-		}
-	},
 	"styleSectionsTitle": {
 		"message": "Bölümler",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "$stylename$ Stilini Düzenleyin",
 		"description": "Title of the page for editing styles",
@@ -363,34 +114,6 @@
 		"message": "Şununla başlayan URL'ler:",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
-	"popupStylesFirst": {
-		"message": "Styles before commands",
-		"description": "Label for the checkbox controlling section order in the popup."
-	},
 	"sectionHelp": {
 		"message": "Bölümler, aynı stil içindeki farklı URL kümelerine uygulanacak farklı kod parçaları tanımlamanıza olanak sağlar. Örneğin, tek bir stil bir sitenin ana sayfasını belirli bir şekilde değiştirirken, sayfanın kalan kısmını farklı bir şekilde değiştirebilir.",
 		"description": "Help text for sections"
@@ -407,42 +130,10 @@
 		"message": "Kaldır",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "Şuraya uygulanır",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "Yüklü stilleri yönet",
 		"description": "Link to open the manage page."
@@ -464,54 +155,10 @@
 		"message": "Güncellemeyi yükle",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "Bölümü kaldır",
 		"description": "Label for the button to remove a section"
 	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
-	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "Güncelleme tamamlandı.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +167,10 @@
 		"message": "Kontrol ediliyor...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "Kod",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
-	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "Bu bölümdeki kodun hangi URLlere uygulanacağını sınırlamak için 'Şuraya uygulanır' denetimlerini kullanın.",
 		"description": "Help text for 'applies to' section"
@@ -568,198 +179,26 @@
 		"message": "Stili Düzenle",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
-	"appliesUrlOption": {
-		"message": "URL",
-		"description": "Option to make the style apply to the entered string as a URL"
-	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus doesn't work on pages like this.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "Stil Ekleyin",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
-	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "Tüm stiller için güncellemeleri denetle",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "Sil",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "Yeni stil oluşturun",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
-	},
 	"editStyleLabel": {
 		"message": "Düzenle",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
 	"description": {
 		"message": "Kullanıcı stil yöneticisi Stylus ile Web'in stilini yenileyin. Stylus Google, Facebook, YouTube, Orkut ve diğer pek çok site için temalar ve görünüm yüklemenize imkân tanır.",
 		"description": "Extension description"
diff --git a/_locales/zh/messages.json b/_locales/zh/messages.json
index fe54f6a6..dee83899 100644
--- a/_locales/zh/messages.json
+++ b/_locales/zh/messages.json
@@ -3,46 +3,6 @@
 		"message": "所有站点",
 		"description": "Text displayed for styles that apply to all sites"
 	},
-	"defaultTheme": {
-		"message": "default",
-		"description": "Default CodeMirror CSS theme option on the edit style page"
-	},
-	"styleRegexpTestTitle": {
-		"message": "List of matching opened tabs (click on URL to focus its tab)",
-		"description": "RegExp test report: title of the report"
-	},
-	"bckpInstStyles": {
-		"message": "Export styles",
-		"description": ""
-	},
-	"optionsUpdateInterval": {
-		"message": "Automatically check for and install all available userstyle updates (in hrs)",
-		"description": ""
-	},
-	"styleEnabledToggleHint": {
-		"message": "Press Alt-Enter to toggle enabled/disabled state and save the style",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
-	"exportLabel": {
-		"message": "Export",
-		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
-	},
-	"issues": {
-		"message": "Issues",
-		"description": "Label for the CSSLint issues block on the style edit page"
-	},
-	"optionsBadgeNormal": {
-		"message": "Background color",
-		"description": ""
-	},
-	"updateCheckHistory": {
-		"message": "History of update checks",
-		"description": ""
-	},
-	"cm_tabSize": {
-		"message": "Tab size",
-		"description": "Label for the text box controlling tab size option for the style editor."
-	},
 	"enableStyleLabel": {
 		"message": "启用",
 		"description": "Label for the button to enable a style"
@@ -51,14 +11,6 @@
 		"message": "请输入名称.",
 		"description": "Error displayed when user saves without providing a name"
 	},
-	"genericHistoryLabel": {
-		"message": "History",
-		"description": "Used in various places to show a history log of something"
-	},
-	"shortcutsNote": {
-		"message": "Define keyboard shortcuts",
-		"description": ""
-	},
 	"appliesDomainOption": {
 		"message": "指定域上的URL",
 		"description": "Option to make the style apply to the entered string as a domain"
@@ -67,62 +19,10 @@
 		"message": "检查更新",
 		"description": "Label for the button to check a single style for an update"
 	},
-	"styleNotAppliedRegexpProblemTooltip": {
-		"message": "Style was not applied due to its incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were not applied at all"
-	},
-	"styleRegexpInvalidExplanation": {
-		"message": "Some 'regexp()' rules that could not be compiled at all.",
-		"description": ""
-	},
-	"optionsIconDark": {
-		"message": "Dark browser themes",
-		"description": ""
-	},
-	"importAppendLabel": {
-		"message": "Append to style",
-		"description": "Label for the button to import a style and append to the existing sections"
-	},
-	"optionsOpenManager": {
-		"message": "Manage styles",
-		"description": ""
-	},
-	"updateAllCheckSucceededNoUpdate": {
-		"message": "No updates found.",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"importReportLegendAdded": {
-		"message": "added",
-		"description": "Text after the number of styles added in the report shown after importing styles"
-	},
-	"styleFromMozillaFormatPrompt": {
-		"message": "Paste the Mozilla-format code",
-		"description": "Prompt in the dialog displayed after clicking 'Import from Mozilla format' button"
-	},
-	"dragDropMessage": {
-		"message": "Drop your backup file anywhere on this page to import.",
-		"description": "Drag'n'drop message"
-	},
 	"helpAlt": {
 		"message": "帮助",
 		"description": "Alternate text for help buttons"
 	},
-	"confirmOK": {
-		"message": "OK",
-		"description": ""
-	},
-	"search": {
-		"message": "Search",
-		"description": "Label before the search input field in the editor shown on Ctrl-F"
-	},
-	"manageFaviconsGray": {
-		"message": "Grayed out",
-		"description": "Label for the checkbox that toggles grayed out mode of applies-to favicons in the new UI on manage page"
-	},
-	"confirmYes": {
-		"message": "Yes",
-		"description": "'Yes' button in a confirm dialog"
-	},
 	"findStylesForSite": {
 		"message": "查找更多适合此站点的样式",
 		"description": "Text for a link that gets a list of styles for the current site"
@@ -131,14 +31,6 @@
 		"message": "已安装的样式",
 		"description": "Heading for the manage page"
 	},
-	"styleBeautify": {
-		"message": "Beautify",
-		"description": "Label for the CSS-beautifier button on the edit style page"
-	},
-	"styleRegexpProblemTooltip": {
-		"message": "Number of sections not applied due to incorrect usage of 'regexp()'",
-		"description": "Tooltip in the popup for styles that were applied only partially"
-	},
 	"styleEnabledLabel": {
 		"message": "已启用",
 		"description": "Label for the enabled state of styles"
@@ -151,38 +43,10 @@
 		"message": "添加新节",
 		"description": "Label for the button to add a section"
 	},
-	"styleRegexpTestPartial": {
-		"message": "Not matching fully, hence skipped",
-		"description": "RegExp test report: label for the partially matching expressions"
-	},
 	"styleSaveLabel": {
 		"message": "保存",
 		"description": "Label for save button for style editing"
 	},
-	"confirmDelete": {
-		"message": "Delete",
-		"description": ""
-	},
-	"confirmCancel": {
-		"message": "Cancel",
-		"description": ""
-	},
-	"retrieveBckp": {
-		"message": "Import styles",
-		"description": ""
-	},
-	"confirmStop": {
-		"message": "Stop",
-		"description": "'Stop' button in a confirm dialog"
-	},
-	"writeStyleForURL": {
-		"message": "this URL",
-		"description": "Text for link in toolbar pop-up to write a new style for the current URL"
-	},
-	"optionsSubheading": {
-		"message": "More Options",
-		"description": "Subheading for options section on manage page."
-	},
 	"appliesAdd": {
 		"message": "添加",
 		"description": "Label for the button to add an 'applies' entry"
@@ -191,14 +55,6 @@
 		"message": "匹配正则的URL",
 		"description": "Option to make the style apply to the entered string as a regular expression"
 	},
-	"optionsAdvancedExposeIframesNote": {
-		"message": "Enables writing iframe-specific CSS like 'html[stylus-iframe] h1 { display:none }'",
-		"description": ""
-	},
-	"importReportLegendUpdatedCode": {
-		"message": "updated code",
-		"description": "Text after the number of styles with updated code (meta info is unchanged) in the report shown after importing styles"
-	},
 	"styleInstall": {
 		"message": "安装 '$stylename$' 到 Stylus?",
 		"description": "Confirmation when installing a style",
@@ -208,58 +64,10 @@
 			}
 		}
 	},
-	"optionsBadgeDisabled": {
-		"message": "Background color when disabled",
-		"description": ""
-	},
-	"optionsCheck": {
-		"message": "Update styles",
-		"description": ""
-	},
-	"manageText": {
-		"message": "<a href='https://userstyles.org'>Get styles on userstyles.org</a> | <a href='http://add0n.com/stylus.html'>Get help</a>",
-		"description": "Help text on the manage page"
-	},
-	"manageOnlyLocal": {
-		"message": "Only locally created styles",
-		"description": "Checkbox to show only locally created styles i.e. non-updatable"
-	},
-	"searchStyles": {
-		"message": "Search contents",
-		"description": "Label for the search filter textbox on the Manage styles page"
-	},
-	"optionsUpdateImportNote": {
-		"message": "When importing style backups from old version or from Stylish, do a one-time check for updates manually in the styles manager to ensure all styles are updated.",
-		"description": ""
-	},
-	"checkAllUpdatesForce": {
-		"message": "Check again, I didn't edit any styles!",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"unreachableFileHint": {
-		"message": "Stylus can access file:// URLs only if you enable the corresponding checkbox for Stylus extension on chrome://extensions page.",
-		"description": "Note in the toolbar popup for file:// URLs"
-	},
 	"disableStyleLabel": {
 		"message": "禁用",
 		"description": "Label for the button to disable a style"
 	},
-	"prefShowBadge": {
-		"message": "Number of styles active for the current site",
-		"description": "Label for the checkbox controlling toolbar badge text."
-	},
-	"manageFavicons": {
-		"message": "Favicons in applies-to column",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"menuShowBadge": {
-		"message": "Show active style count",
-		"description": "Label (must be very short) for the checkbox in the toolbar button context menu controlling toolbar badge text."
-	},
-	"cm_lineWrapping": {
-		"message": "Word wrap",
-		"description": "Label for the checkbox controlling word wrap option for the style editor."
-	},
 	"styleCancelEditLabel": {
 		"message": "返回到管理",
 		"description": "Label for cancel button for style editing"
@@ -268,50 +76,14 @@
 		"message": "您已经修改了此样式，但尚未保存",
 		"description": "Text for the prompt when changes are made to a style and the user tries to leave without saving"
 	},
-	"importLabel": {
-		"message": "Import",
-		"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
-	},
-	"shortcuts": {
-		"message": "Shortcuts",
-		"description": "Go to shortcut configuration"
-	},
 	"updateCheckFailServerUnreachable": {
 		"message": "更新失败: 服务器无法访问.",
 		"description": "Text that displays when an update check failed because the update server is unreachable"
 	},
-	"manageFilters": {
-		"message": "Filters",
-		"description": "Label for filters container"
-	},
-	"applyAllUpdates": {
-		"message": "Apply all updates",
-		"description": "Label for the button to apply all detected updates"
-	},
-	"optionsReset": {
-		"message": "Reset the options to default values",
-		"description": ""
-	},
-	"optionsCustomizeUpdate": {
-		"message": "Updates",
-		"description": ""
-	},
 	"deleteStyleConfirm": {
 		"message": "确定要删除这个样式吗?",
 		"description": "Confirmation before deleting a style"
 	},
-	"optionsCustomizePopup": {
-		"message": "Popup",
-		"description": ""
-	},
-	"styleBadRegexp": {
-		"message": "Regexp is invalid.",
-		"description": "Validation message for a bad regexp in a style"
-	},
-	"optionsHeading": {
-		"message": "Options",
-		"description": "Heading for options section on manage page."
-	},
 	"appliesDisplay": {
 		"message": "应用到: $applies$",
 		"description": "Text on the manage screen to describe what the style applies to",
@@ -321,14 +93,6 @@
 			}
 		}
 	},
-	"optionsIconLight": {
-		"message": "Light browser themes",
-		"description": ""
-	},
-	"openStylesManager": {
-		"message": "Open styles manager",
-		"description": "Label for the style maanger opener in the browser action context menu."
-	},
 	"styleUpdate": {
 		"message": "你確定要更新 '$stylename$' 嗎？",
 		"description": "Confirmation when updating a style",
@@ -342,10 +106,6 @@
 		"message": "样式节",
 		"description": "Title for the style sections section"
 	},
-	"importReportLegendInvalid": {
-		"message": "invalid skipped",
-		"description": "Text after the number of styles skipped due to being invalid (not a Stylus/Stylish backup file probably) in the report shown after importing styles"
-	},
 	"editStyleTitle": {
 		"message": "编辑样式 $stylename$",
 		"description": "Title of the page for editing styles",
@@ -363,34 +123,6 @@
 		"message": "以指定地址开始",
 		"description": "Option to make the style apply to the entered string as a URL prefix"
 	},
-	"cm_matchHighlightToken": {
-		"message": "Token under cursor",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of of the word/token under cursor even if nothing is selected"
-	},
-	"searchRegexp": {
-		"message": "Use /re/ syntax for regexp search",
-		"description": "Label after the search input field in the editor shown on Ctrl-F"
-	},
-	"updateCheckManualUpdateHint": {
-		"message": "Forcing an update will overwrite any local edits.",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"toggleStyle": {
-		"message": "Toggle style",
-		"description": "Label for the checkbox to enable/disable a style"
-	},
-	"importReplaceTooltip": {
-		"message": "Discard contents of current style and overwrite it with the imported style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"cm_resizeGripHint": {
-		"message": "Double-click to maximize/restore the height",
-		"description": "Tooltip for the resize grip in style editor"
-	},
-	"popupStylesFirst": {
-		"message": "Styles before commands",
-		"description": "Label for the checkbox controlling section order in the popup."
-	},
 	"sectionHelp": {
 		"message": "样式节允许你定义多个样式段落并将它们应用于不同的站点匹配规则上。例如，一个样式可以更改使用一个方式来更改主页，而此时其它的样式段可以更改站点的其它部分。",
 		"description": "Help text for sections"
@@ -407,42 +139,10 @@
 		"message": "移除",
 		"description": "Label for the button to remove an 'applies' entry"
 	},
-	"updatesCurrentlyInstalled": {
-		"message": "Updates installed:",
-		"description": "Text that displays when an update is installed on options page. Followed by the number of currently installed updates."
-	},
-	"styleToMozillaFormatTitle": {
-		"message": "Style in Mozilla format",
-		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
-	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
-	"writeStyleFor": {
-		"message": "Write style for: ",
-		"description": "Label for toolbar pop-up that precedes the links to write a new style"
-	},
-	"replace": {
-		"message": "Replace",
-		"description": "Label before the replace input field in the editor shown on Ctrl-H"
-	},
-	"styleRegexpTestNone": {
-		"message": "No matching tabs",
-		"description": "RegExp test report: label for expressions that didn't match any tabs"
-	},
-	"importReportLegendUpdatedMeta": {
-		"message": "updated meta info",
-		"description": "Text after the number of styles with updated meta info like name/url in the report shown after importing styles"
-	},
 	"appliesLabel": {
 		"message": "应用到",
 		"description": "Label for 'applies to' fields on the edit/add screen"
 	},
-	"openOptionsPopup": {
-		"message": "Options",
-		"description": "Go to Options UI"
-	},
 	"openManage": {
 		"message": "管理已安装样式",
 		"description": "Link to open the manage page."
@@ -464,54 +164,10 @@
 		"message": "安装更新",
 		"description": "Label for the button to install an update for a single style"
 	},
-	"optionsCheckUpdate": {
-		"message": "Check for and install all available updates",
-		"description": ""
-	},
-	"importReportTitle": {
-		"message": "Finished importing styles",
-		"description": "Title of the report shown after importing styles"
-	},
-	"styleMozillaFormatHeading": {
-		"message": "Mozilla Format",
-		"description": "Heading for the section with buttons to import/export Mozilla format of the style"
-	},
-	"cm_matchHighlight": {
-		"message": "Highlight",
-		"description": "Label for the drop-down list controlling the automatic highlighting of current word/selection occurrences in the style editor."
-	},
-	"styleRegexpPartialExplanation": {
-		"message": "This style uses partially matching regexps in violation of <a href='https://developer.mozilla.org/docs/Web/CSS/@document'>CSS4 @document specification</a> which requires a full URL match. The affected CSS sections were not applied to the page. This style was probably created in Stylish-for-Chrome which incorrectly checks 'regexp()' rules since the very first version (known bug).",
-		"description": ""
-	},
-	"styleBeautifyIndentConditional": {
-		"message": "Indent @media, @supports",
-		"description": "CSS-beautifier option"
-	},
-	"unreachableContentScript": {
-		"message": "Could not communicate with the page. Try reloading the tab.",
-		"description": "Note in the toolbar popup usually on file:// URLs after [re]loading Stylus"
-	},
 	"sectionRemove": {
 		"message": "移除节",
 		"description": "Label for the button to remove a section"
 	},
-	"disableAllStyles": {
-		"message": "Turn all styles off",
-		"description": "Label for the checkbox that turns all enabled styles off."
-	},
-	"updateCheckSkippedMaybeLocallyEdited": {
-		"message": "This style might have been edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing possible local modifications"
-	},
-	"undoGlobal": {
-		"message": "Undo in all sections",
-		"description": "CSS-beautify global Undo button label"
-	},
-	"optionsCustomizeIcon": {
-		"message": "Toolbar icon",
-		"description": ""
-	},
 	"updateCompleted": {
 		"message": "更新完成.",
 		"description": "Text that displays when an update completed"
@@ -520,46 +176,10 @@
 		"message": "检查中...",
 		"description": "Text to display when checking a style for an update"
 	},
-	"styleRegexpTestFull": {
-		"message": "Matching tabs",
-		"description": "RegExp test report: label for the fully matching expressions"
-	},
-	"manageMaxTargets": {
-		"message": "Number of applies-to items",
-		"description": "Label for the numeric input box to limit max number of applies-to targets in the new UI on manage page"
-	},
-	"manageFaviconsHelp": {
-		"message": "Stylus uses an external service https://www.google.com/s2/favicons",
-		"description": "Label for the checkbox that toggles applies-to favicons in the new UI on manage page"
-	},
-	"updateCheckSkippedLocallyEdited": {
-		"message": "This style was edited locally.",
-		"description": "Text that displays when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsResetButton": {
-		"message": "Reset options",
-		"description": ""
-	},
 	"sectionCode": {
 		"message": "代码",
 		"description": "Label for the code for a section"
 	},
-	"optionsAdvancedContextDelete": {
-		"message": "Add 'Delete' in editor context menu",
-		"description": ""
-	},
-	"importReportLegendUpdatedBoth": {
-		"message": "updated both meta info and code",
-		"description": "Text after the number of styles updated entirely in the report shown after importing styles"
-	},
-	"cm_smartIndent": {
-		"message": "Use smart indentation",
-		"description": "Label for the checkbox controlling smart indentation option for the style editor."
-	},
-	"styleRegexpTestButton": {
-		"message": "RegExp test",
-		"description": "RegExp test button label in the editor shown when applies-to list has a regexp value"
-	},
 	"appliesHelp": {
 		"message": "使用“应用到”来控制这个样式应用到哪些地址上。",
 		"description": "Help text for 'applies to' section"
@@ -568,198 +188,30 @@
 		"message": "编辑样式",
 		"description": "Title of the page for editing styles"
 	},
-	"editDeleteText": {
-		"message": "Delete",
-		"description": "Label for the context menu item in the editor to delete selected text"
-	},
-	"cm_autocompleteOnTyping": {
-		"message": "Autocomplete on typing",
-		"description": "Label for the checkbox in the style editor."
-	},
-	"stylusUnavailableForURLdetails": {
-		"message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version or about:addons) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
-		"description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"cm_matchHighlightSelection": {
-		"message": "Selection only",
-		"description": "Style editor's 'highglight' drop-down list option: highlight the occurrences of currently selected text"
-	},
 	"appliesUrlOption": {
 		"message": "地址",
 		"description": "Option to make the style apply to the entered string as a URL"
 	},
-	"updateAllCheckSucceededSomeEdited": {
-		"message": "Some updatable styles weren't checked to avoid losing possible local edits. Updates can be forced by checking individually, or by running another check for all styles (local edits will be overwritten).",
-		"description": "Text that displays when an update all check completed and no updates are available"
-	},
-	"stylusUnavailableForURL": {
-		"message": "Stylus doesn't work on pages like this.",
-		"description": "Note in the toolbar pop-up when on a URL Stylus can't affect"
-	},
-	"manageOnlyUpdates": {
-		"message": "Only with updates or issues",
-		"description": "Checkbox to show only styles that have updates after check-all-styles-for-updates was performed"
-	},
 	"addStyleTitle": {
 		"message": "添加样式",
 		"description": "Title of the page for adding styles"
 	},
-	"importReplaceLabel": {
-		"message": "Overwrite style",
-		"description": "Label for the button to import and overwrite current style"
-	},
-	"dbError": {
-		"message": "An error has occurred using the Stylus database. Would you like to visit a web page with possible solutions?",
-		"description": "Prompt when a DB error is encountered"
-	},
-	"optionsAdvanced": {
-		"message": "Advanced",
-		"description": ""
-	},
-	"importAppendTooltip": {
-		"message": "Append the imported style to current style",
-		"description": "Tooltip for the button to import a style and append to the existing sections"
-	},
-	"editorStylesButton": {
-		"message": "Find editor styles",
-		"description": "Find styles for the editor"
-	},
-	"optionsOpen": {
-		"message": "Open",
-		"description": ""
-	},
-	"helpKeyMapHotkey": {
-		"message": "Press a hotkey",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
-	"styleRegexpTestInvalid": {
-		"message": "Invalid regexps skipped",
-		"description": "RegExp test report: label for the invalid expressions"
-	},
-	"replaceAll": {
-		"message": "Replace all",
-		"description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
-	},
-	"importReportUnchanged": {
-		"message": "Nothing was changed.",
-		"description": "Message in the report shown after importing styles"
-	},
-	"optionsActions": {
-		"message": "Actions",
-		"description": ""
-	},
-	"editGotoLine": {
-		"message": "Goto line (or line:col)",
-		"description": "Go to line or line:column on Ctrl-G in style code editor"
-	},
-	"manageOnlyLocalTooltip": {
-		"message": "(the styles not installed through a userstyles.org page)",
-		"description": "Tooltip for the checkbox to show only locally created styles i.e. non-updatable"
-	},
 	"checkAllUpdates": {
 		"message": "检查所有样式的更新",
 		"description": "Label for the button to check all styles for updates"
 	},
-	"openOptionsManage": {
-		"message": "Options UI",
-		"description": "Go to Options UI"
-	},
-	"issuesHelp": {
-		"message": "The issues found by <a href='https://github.com/CSSLint/csslint' target='_blank'>CSSLint</a> with these rules enabled:",
-		"description": "Help popup message for the CSSLint issues block on the style edit page"
-	},
-	"optionsCustomizeBadge": {
-		"message": "Badge on the toolbar icon",
-		"description": ""
-	},
-	"importReportLegendIdentical": {
-		"message": "identical skipped",
-		"description": "Text after the number of styles skipped due to being identical to the already installed ones in the report shown after importing styles"
-	},
-	"optionsPopupWidth": {
-		"message": "Popup width (in pixels)",
-		"description": ""
-	},
-	"confirmNo": {
-		"message": "No",
-		"description": "'No' button in a confirm dialog"
-	},
-	"undo": {
-		"message": "Undo",
-		"description": "Button label"
-	},
-	"cm_keyMap": {
-		"message": "Keymap",
-		"description": "Label for the drop-down list controlling the keymap for the style editor."
-	},
-	"manageNewUI": {
-		"message": "New manage UI layout",
-		"description": "Label for the checkbox that toggles the new UI on manage page"
-	},
-	"importReportUndoneTitle": {
-		"message": "Import has been undone",
-		"description": "Title of the message box shown after undoing the import of styles"
-	},
-	"genericDisabledLabel": {
-		"message": "Disabled",
-		"description": "Used in various lists/options to indicate that something is disabled"
-	},
-	"cm_indentWithTabs": {
-		"message": "Use tabs with smart indentation",
-		"description": "Label for the checkbox controlling tabs with smart indentation option for the style editor."
-	},
-	"replaceWith": {
-		"message": "Replace with",
-		"description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
-	},
 	"deleteStyleLabel": {
 		"message": "删除",
 		"description": "Label for the button to delete a style"
 	},
-	"updateCheckManualUpdateForce": {
-		"message": "Install update (local edits will be overwritten)",
-		"description": "Additional text displayed when an update check skipped updating the style to avoid losing local modifications"
-	},
-	"optionsAdvancedExposeIframes": {
-		"message": "Expose iframes via HTML[stylus-iframe]",
-		"description": ""
-	},
 	"addStyleLabel": {
 		"message": "编写新的样式",
 		"description": "Label for the button to go to the add style page"
 	},
-	"optionsUpdateIntervalNote": {
-		"message": "To disable the automatic userstyle update checks, set interval to 0",
-		"description": ""
-	},
-	"backupButtons": {
-		"message": "Backup",
-		"description": "Heading for backup"
-	},
-	"manageOnlyEnabled": {
-		"message": "Only enabled styles",
-		"description": "Checkbox to show only enabled styles"
-	},
 	"editStyleLabel": {
 		"message": "编辑",
 		"description": "Label for the button to go to the edit style page"
 	},
-	"cm_theme": {
-		"message": "Theme",
-		"description": "Label for the style editor's CSS theme."
-	},
-	"backupMessage": {
-		"message": "Select a file or drag and drop to this page.",
-		"description": "Message for backup"
-	},
-	"importReportUndone": {
-		"message": "styles were reverted",
-		"description": "Text after the number of styles reverted in the message box shown after undoing the import of styles"
-	},
-	"helpKeyMapCommand": {
-		"message": "Type a command name",
-		"description": "Placeholder text of inputbox in keymap help popup on the edit style page. Must be very short"
-	},
 	"description": {
 		"message": "Stylus，一个用户样式管理器，帮助您重新定义网页样式。Stylus易于为Google，Facebook，Youtube，Orkut以及其它各类型网站安装样式和主题。",
 		"description": "Extension description"
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index fc8d7041..b3f92c35 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -415,10 +415,6 @@
 		"message": "Mozilla 格式的样式",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "编写样式给：",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index e6119371..cead174b 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -415,10 +415,6 @@
 		"message": "Mozilla格式樣式表",
 		"description": "Title of the popup with the style code in Mozilla format, shown after pressing the Export button on Edit style page"
 	},
-	"manageTitle": {
-		"message": "Stylus",
-		"description": "Title for the manage page"
-	},
 	"writeStyleFor": {
 		"message": "編寫樣式給：",
 		"description": "Label for toolbar pop-up that precedes the links to write a new style"

From ed83f8f77e00c7ea7f5a8d0d46fb5de8a47cc762 Mon Sep 17 00:00:00 2001
From: narcolepticinsomniac <therealdoctorgonzo@gmail.com>
Date: Wed, 12 Jul 2017 09:22:49 -0400
Subject: [PATCH 71/94] Switch date format for backups

Fixes #114
---
 backup/fileSaveLoad.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
index 67f6b077..7626a1b2 100644
--- a/backup/fileSaveLoad.js
+++ b/backup/fileSaveLoad.js
@@ -347,7 +347,7 @@ $('#file-all-styles').onclick = () => {
     const dd = ('0' + today.getDate()).substr(-2);
     const mm = ('0' + (today.getMonth() + 1)).substr(-2);
     const yyyy = today.getFullYear();
-    return `stylus-${mm}-${dd}-${yyyy}${STYLUS_BACKUP_FILE_EXT}`;
+    return `stylus-${yyyy}-${mm}-${dd}${STYLUS_BACKUP_FILE_EXT}`;
   }
 };
 

From 7a9d629ec867a317f48f7960daefc1ea7a95eb92 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Wed, 12 Jul 2017 13:17:04 -0500
Subject: [PATCH 72/94] Restructure folders

---
 .eslintignore                                 |   5 +-
 background.js => background/background.js     |   0
 messaging.js => background/messaging.js       | 742 ++++++++--------
 storage.js => background/storage.js           |   0
 update.js => background/update.js             |   0
 backup/fileSaveLoad.js                        | 395 ---------
 apply.js => content/apply.js                  |   0
 install.js => content/install.js              | 720 ++++++++--------
 edit.js => edit/edit.js                       |   0
 options/index.html => index.html              |   0
 dom.js => js/dom.js                           |   0
 localization.js => js/localization.js         |   0
 prefs.js => js/prefs.js                       |   0
 manage/fileSaveLoad.js                        | 791 ++++++++++++++++++
 manage.css => manage/manage.css               |   0
 manage.js => manage/manage.js                 |   0
 popup.css => popup/popup.css                  |   0
 popup.js => popup/popup.js                    |   0
 pull_locales.rb => tools/pull_locales.rb      |   0
 pull_locales.sh => tools/pull_locales.sh      |   0
 .../pull_locales_postprocess.py               |   0
 .../beautify}/beautify-css-mod.js             |   0
 .../beautify}/beautify-css.js                 |   0
 .../codemirror}/addon/lint/css-lint.js        |   0
 .../addon/search/match-highlighter.js         |   0
 {codemirror => vendor/codemirror}/LICENSE     |   0
 .../codemirror}/addon/comment/comment.js      |   0
 .../codemirror}/addon/dialog/dialog.css       |   0
 .../codemirror}/addon/dialog/dialog.js        |   0
 .../codemirror}/addon/edit/matchbrackets.js   |   0
 .../codemirror}/addon/fold/brace-fold.js      |   0
 .../codemirror}/addon/fold/comment-fold.js    |   0
 .../codemirror}/addon/fold/foldcode.js        |   0
 .../codemirror}/addon/fold/foldgutter.css     |   0
 .../codemirror}/addon/fold/foldgutter.js      |   0
 .../codemirror}/addon/hint/css-hint.js        |   0
 .../codemirror}/addon/hint/show-hint.css      |   0
 .../codemirror}/addon/hint/show-hint.js       |   0
 .../codemirror}/addon/lint/css-lint.js        |   0
 .../codemirror}/addon/lint/lint.css           |   0
 .../codemirror}/addon/lint/lint.js            |   0
 .../addon/scroll/annotatescrollbar.js         |   0
 .../addon/search/matchesonscrollbar.css       |   0
 .../addon/search/matchesonscrollbar.js        |   0
 .../codemirror}/addon/search/search.js        |   0
 .../codemirror}/addon/search/searchcursor.js  |   0
 .../addon/selection/active-line.js            |   0
 .../codemirror}/keymap/emacs.js               |   0
 .../codemirror}/keymap/sublime.js             |   0
 .../codemirror}/keymap/vim.js                 |   0
 .../codemirror}/lib/codemirror.css            |   0
 .../codemirror}/lib/codemirror.js             |   0
 .../codemirror}/mode/css/css.js               |   0
 .../codemirror}/mode/css/gss.html             |   0
 .../codemirror}/mode/css/gss_test.js          |   0
 .../codemirror}/mode/css/index.html           |   0
 .../codemirror}/mode/css/less.html            |   0
 .../codemirror}/mode/css/less_test.js         |   0
 .../codemirror}/mode/css/scss.html            |   0
 .../codemirror}/mode/css/scss_test.js         |   0
 .../codemirror}/mode/css/test.js              |   0
 .../codemirror}/theme/3024-day.css            |   0
 .../codemirror}/theme/3024-night.css          |   0
 .../codemirror}/theme/abcdef.css              |   0
 .../codemirror}/theme/ambiance-mobile.css     |   0
 .../codemirror}/theme/ambiance.css            |   0
 .../codemirror}/theme/base16-dark.css         |   0
 .../codemirror}/theme/base16-light.css        |   0
 .../codemirror}/theme/bespin.css              |   0
 .../codemirror}/theme/blackboard.css          |   0
 .../codemirror}/theme/cobalt.css              |   0
 .../codemirror}/theme/colorforth.css          |   0
 .../codemirror}/theme/dracula.css             |   0
 .../codemirror}/theme/duotone-dark.css        |   0
 .../codemirror}/theme/duotone-light.css       |   0
 .../codemirror}/theme/eclipse.css             |   0
 .../codemirror}/theme/elegant.css             |   0
 .../codemirror}/theme/erlang-dark.css         |   0
 .../codemirror}/theme/hopscotch.css           |   0
 .../codemirror}/theme/icecoder.css            |   0
 .../codemirror}/theme/isotope.css             |   0
 .../codemirror}/theme/lesser-dark.css         |   0
 .../codemirror}/theme/liquibyte.css           |   0
 .../codemirror}/theme/material.css            |   0
 .../codemirror}/theme/mbo.css                 |   0
 .../codemirror}/theme/mdn-like.css            |   0
 .../codemirror}/theme/midnight.css            |   0
 .../codemirror}/theme/monokai.css             |   0
 .../codemirror}/theme/neat.css                |   0
 .../codemirror}/theme/neo.css                 |   0
 .../codemirror}/theme/night.css               |   0
 .../codemirror}/theme/panda-syntax.css        |   0
 .../codemirror}/theme/paraiso-dark.css        |   0
 .../codemirror}/theme/paraiso-light.css       |   0
 .../codemirror}/theme/pastel-on-dark.css      |   0
 .../codemirror}/theme/railscasts.css          |   0
 .../codemirror}/theme/rubyblue.css            |   0
 .../codemirror}/theme/seti.css                |   0
 .../codemirror}/theme/solarized.css           |   0
 .../codemirror}/theme/the-matrix.css          |   0
 .../theme/tomorrow-night-bright.css           |   0
 .../theme/tomorrow-night-eighties.css         |   0
 .../codemirror}/theme/ttcn.css                |   0
 .../codemirror}/theme/twilight.css            |   0
 .../codemirror}/theme/vibrant-ink.css         |   0
 .../codemirror}/theme/xq-dark.css             |   0
 .../codemirror}/theme/xq-light.css            |   0
 .../codemirror}/theme/yeti.css                |   0
 .../codemirror}/theme/zenburn.css             |   0
 {csslint => vendor/csslint}/WARNING.txt       |   0
 {csslint => vendor/csslint}/csslint-worker.js |   0
 111 files changed, 1524 insertions(+), 1129 deletions(-)
 rename background.js => background/background.js (100%)
 rename messaging.js => background/messaging.js (96%)
 rename storage.js => background/storage.js (100%)
 rename update.js => background/update.js (100%)
 delete mode 100644 backup/fileSaveLoad.js
 rename apply.js => content/apply.js (100%)
 rename install.js => content/install.js (96%)
 rename edit.js => edit/edit.js (100%)
 rename options/index.html => index.html (100%)
 rename dom.js => js/dom.js (100%)
 rename localization.js => js/localization.js (100%)
 rename prefs.js => js/prefs.js (100%)
 create mode 100644 manage/fileSaveLoad.js
 rename manage.css => manage/manage.css (100%)
 rename manage.js => manage/manage.js (100%)
 rename popup.css => popup/popup.css (100%)
 rename popup.js => popup/popup.js (100%)
 rename pull_locales.rb => tools/pull_locales.rb (100%)
 rename pull_locales.sh => tools/pull_locales.sh (100%)
 mode change 100755 => 100644
 rename pull_locales_postprocess.py => tools/pull_locales_postprocess.py (100%)
 rename {beautify => vendor-overwrites/beautify}/beautify-css-mod.js (100%)
 rename {beautify => vendor-overwrites/beautify}/beautify-css.js (100%)
 rename {codemirror-overwrites => vendor-overwrites/codemirror}/addon/lint/css-lint.js (100%)
 rename {codemirror-overwrites => vendor-overwrites/codemirror}/addon/search/match-highlighter.js (100%)
 rename {codemirror => vendor/codemirror}/LICENSE (100%)
 rename {codemirror => vendor/codemirror}/addon/comment/comment.js (100%)
 rename {codemirror => vendor/codemirror}/addon/dialog/dialog.css (100%)
 rename {codemirror => vendor/codemirror}/addon/dialog/dialog.js (100%)
 rename {codemirror => vendor/codemirror}/addon/edit/matchbrackets.js (100%)
 rename {codemirror => vendor/codemirror}/addon/fold/brace-fold.js (100%)
 rename {codemirror => vendor/codemirror}/addon/fold/comment-fold.js (100%)
 rename {codemirror => vendor/codemirror}/addon/fold/foldcode.js (100%)
 rename {codemirror => vendor/codemirror}/addon/fold/foldgutter.css (100%)
 rename {codemirror => vendor/codemirror}/addon/fold/foldgutter.js (100%)
 rename {codemirror => vendor/codemirror}/addon/hint/css-hint.js (100%)
 rename {codemirror => vendor/codemirror}/addon/hint/show-hint.css (100%)
 rename {codemirror => vendor/codemirror}/addon/hint/show-hint.js (100%)
 rename {codemirror => vendor/codemirror}/addon/lint/css-lint.js (100%)
 rename {codemirror => vendor/codemirror}/addon/lint/lint.css (100%)
 rename {codemirror => vendor/codemirror}/addon/lint/lint.js (100%)
 rename {codemirror => vendor/codemirror}/addon/scroll/annotatescrollbar.js (100%)
 rename {codemirror => vendor/codemirror}/addon/search/matchesonscrollbar.css (100%)
 rename {codemirror => vendor/codemirror}/addon/search/matchesonscrollbar.js (100%)
 rename {codemirror => vendor/codemirror}/addon/search/search.js (100%)
 rename {codemirror => vendor/codemirror}/addon/search/searchcursor.js (100%)
 rename {codemirror => vendor/codemirror}/addon/selection/active-line.js (100%)
 rename {codemirror => vendor/codemirror}/keymap/emacs.js (100%)
 rename {codemirror => vendor/codemirror}/keymap/sublime.js (100%)
 rename {codemirror => vendor/codemirror}/keymap/vim.js (100%)
 rename {codemirror => vendor/codemirror}/lib/codemirror.css (100%)
 rename {codemirror => vendor/codemirror}/lib/codemirror.js (100%)
 rename {codemirror => vendor/codemirror}/mode/css/css.js (100%)
 rename {codemirror => vendor/codemirror}/mode/css/gss.html (100%)
 rename {codemirror => vendor/codemirror}/mode/css/gss_test.js (100%)
 rename {codemirror => vendor/codemirror}/mode/css/index.html (100%)
 rename {codemirror => vendor/codemirror}/mode/css/less.html (100%)
 rename {codemirror => vendor/codemirror}/mode/css/less_test.js (100%)
 rename {codemirror => vendor/codemirror}/mode/css/scss.html (100%)
 rename {codemirror => vendor/codemirror}/mode/css/scss_test.js (100%)
 rename {codemirror => vendor/codemirror}/mode/css/test.js (100%)
 rename {codemirror => vendor/codemirror}/theme/3024-day.css (100%)
 rename {codemirror => vendor/codemirror}/theme/3024-night.css (100%)
 rename {codemirror => vendor/codemirror}/theme/abcdef.css (100%)
 rename {codemirror => vendor/codemirror}/theme/ambiance-mobile.css (100%)
 rename {codemirror => vendor/codemirror}/theme/ambiance.css (100%)
 rename {codemirror => vendor/codemirror}/theme/base16-dark.css (100%)
 rename {codemirror => vendor/codemirror}/theme/base16-light.css (100%)
 rename {codemirror => vendor/codemirror}/theme/bespin.css (100%)
 rename {codemirror => vendor/codemirror}/theme/blackboard.css (100%)
 rename {codemirror => vendor/codemirror}/theme/cobalt.css (100%)
 rename {codemirror => vendor/codemirror}/theme/colorforth.css (100%)
 rename {codemirror => vendor/codemirror}/theme/dracula.css (100%)
 rename {codemirror => vendor/codemirror}/theme/duotone-dark.css (100%)
 rename {codemirror => vendor/codemirror}/theme/duotone-light.css (100%)
 rename {codemirror => vendor/codemirror}/theme/eclipse.css (100%)
 rename {codemirror => vendor/codemirror}/theme/elegant.css (100%)
 rename {codemirror => vendor/codemirror}/theme/erlang-dark.css (100%)
 rename {codemirror => vendor/codemirror}/theme/hopscotch.css (100%)
 rename {codemirror => vendor/codemirror}/theme/icecoder.css (100%)
 rename {codemirror => vendor/codemirror}/theme/isotope.css (100%)
 rename {codemirror => vendor/codemirror}/theme/lesser-dark.css (100%)
 rename {codemirror => vendor/codemirror}/theme/liquibyte.css (100%)
 rename {codemirror => vendor/codemirror}/theme/material.css (100%)
 rename {codemirror => vendor/codemirror}/theme/mbo.css (100%)
 rename {codemirror => vendor/codemirror}/theme/mdn-like.css (100%)
 rename {codemirror => vendor/codemirror}/theme/midnight.css (100%)
 rename {codemirror => vendor/codemirror}/theme/monokai.css (100%)
 rename {codemirror => vendor/codemirror}/theme/neat.css (100%)
 rename {codemirror => vendor/codemirror}/theme/neo.css (100%)
 rename {codemirror => vendor/codemirror}/theme/night.css (100%)
 rename {codemirror => vendor/codemirror}/theme/panda-syntax.css (100%)
 rename {codemirror => vendor/codemirror}/theme/paraiso-dark.css (100%)
 rename {codemirror => vendor/codemirror}/theme/paraiso-light.css (100%)
 rename {codemirror => vendor/codemirror}/theme/pastel-on-dark.css (100%)
 rename {codemirror => vendor/codemirror}/theme/railscasts.css (100%)
 rename {codemirror => vendor/codemirror}/theme/rubyblue.css (100%)
 rename {codemirror => vendor/codemirror}/theme/seti.css (100%)
 rename {codemirror => vendor/codemirror}/theme/solarized.css (100%)
 rename {codemirror => vendor/codemirror}/theme/the-matrix.css (100%)
 rename {codemirror => vendor/codemirror}/theme/tomorrow-night-bright.css (100%)
 rename {codemirror => vendor/codemirror}/theme/tomorrow-night-eighties.css (100%)
 rename {codemirror => vendor/codemirror}/theme/ttcn.css (100%)
 rename {codemirror => vendor/codemirror}/theme/twilight.css (100%)
 rename {codemirror => vendor/codemirror}/theme/vibrant-ink.css (100%)
 rename {codemirror => vendor/codemirror}/theme/xq-dark.css (100%)
 rename {codemirror => vendor/codemirror}/theme/xq-light.css (100%)
 rename {codemirror => vendor/codemirror}/theme/yeti.css (100%)
 rename {codemirror => vendor/codemirror}/theme/zenburn.css (100%)
 rename {csslint => vendor/csslint}/WARNING.txt (100%)
 rename {csslint => vendor/csslint}/csslint-worker.js (100%)

diff --git a/.eslintignore b/.eslintignore
index 325be71d..a710e413 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,2 @@
-beautify/
-codemirror/
-csslint/
+vendor/
+vendor-overwrites/
diff --git a/background.js b/background/background.js
similarity index 100%
rename from background.js
rename to background/background.js
diff --git a/messaging.js b/background/messaging.js
similarity index 96%
rename from messaging.js
rename to background/messaging.js
index 42f8b593..ac529c92 100644
--- a/messaging.js
+++ b/background/messaging.js
@@ -1,371 +1,371 @@
-/* global BG: true, onRuntimeMessage, applyOnMessage, handleUpdate, handleDelete */
-'use strict';
-
-// keep message channel open for sendResponse in chrome.runtime.onMessage listener
-const KEEP_CHANNEL_OPEN = true;
-
-const FIREFOX = /Firefox/.test(navigator.userAgent);
-const OPERA = /OPR/.test(navigator.userAgent);
-
-const URLS = {
-  ownOrigin: chrome.runtime.getURL(''),
-
-  optionsUI: [
-    chrome.runtime.getURL('options/index.html'),
-    'chrome://extensions/?options=' + chrome.runtime.id,
-  ],
-
-  configureCommands:
-    OPERA ? 'opera://settings/configureCommands'
-          : 'chrome://extensions/configureCommands',
-
-  // CWS cannot be scripted in chromium, see ChromeExtensionsClient::IsScriptableURL
-  // https://cs.chromium.org/chromium/src/chrome/common/extensions/chrome_extensions_client.cc
-  chromeWebStore: FIREFOX ? 'https://addons.mozilla.org/' : (
-    OPERA ? 'https://addons.opera.com/' : 'https://chrome.google.com/webstore/'
-  ),
-
-  supported: new RegExp(
-    '^(file|ftps?|http)://|' +
-    `^https://${FIREFOX ? '(?!addons\\.mozilla\\.org)' : (
-      OPERA ? '(?!addons\\.opera\\.com)' : '(?!chrome\\.google\\.com/webstore)'
-    )}|` +
-    '^' + chrome.runtime.getURL('')),
-};
-
-let BG = chrome.extension.getBackgroundPage();
-
-if (!BG || BG != window) {
-  document.documentElement.classList.toggle('firefox', FIREFOX);
-  document.documentElement.classList.toggle('opera', OPERA);
-  // TODO: remove once our manifest's minimum_chrome_version is 50+
-  // Chrome 49 doesn't report own extension pages in webNavigation apparently
-  if (navigator.userAgent.includes('Chrome/49.')) {
-    getActiveTab().then(BG.updateIcon);
-  }
-}
-
-function notifyAllTabs(msg) {
-  const originalMessage = msg;
-  if (msg.method == 'styleUpdated' || msg.method == 'styleAdded') {
-    // apply/popup/manage use only meta for these two methods,
-    // editor may need the full code but can fetch it directly,
-    // so we send just the meta to avoid spamming lots of tabs with huge styles
-    msg = Object.assign({}, msg, {
-      style: getStyleWithNoCode(msg.style)
-    });
-  }
-  const affectsAll = !msg.affects || msg.affects.all;
-  const affectsOwnOriginOnly = !affectsAll && (msg.affects.editor || msg.affects.manager);
-  const affectsTabs = affectsAll || affectsOwnOriginOnly;
-  const affectsIcon = affectsAll || msg.affects.icon;
-  const affectsPopup = affectsAll || msg.affects.popup;
-  const affectsSelf = affectsPopup || msg.prefs;
-  if (affectsTabs || affectsIcon) {
-    const notifyTab = tab => {
-      // own pages will be notified via runtime.sendMessage later
-      if ((affectsTabs || URLS.optionsUI.includes(tab.url))
-      && !(affectsSelf && tab.url.startsWith(URLS.ownOrigin))
-      // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
-      && (!FIREFOX || tab.width)) {
-        chrome.tabs.sendMessage(tab.id, msg);
-      }
-      if (affectsIcon && BG) {
-        BG.updateIcon(tab);
-      }
-    };
-    // list all tabs including chrome-extension:// which can be ours
-    Promise.all([
-      queryTabs(affectsOwnOriginOnly ? {url: URLS.ownOrigin + '*'} : {}),
-      getActiveTab(),
-    ]).then(([tabs, activeTab]) => {
-      const activeTabId = activeTab && activeTab.id;
-      for (const tab of tabs) {
-        invokeOrPostpone(tab.id === activeTabId, notifyTab, tab);
-      }
-    });
-  }
-  // notify self: the message no longer is sent to the origin in new Chrome
-  if (typeof onRuntimeMessage != 'undefined') {
-    onRuntimeMessage(originalMessage);
-  }
-  // notify apply.js on own pages
-  if (typeof applyOnMessage != 'undefined') {
-    applyOnMessage(originalMessage);
-  }
-  // notify background page and all open popups
-  if (affectsSelf) {
-    chrome.runtime.sendMessage(msg);
-  }
-}
-
-
-function queryTabs(options = {}) {
-  return new Promise(resolve =>
-    chrome.tabs.query(options, tabs =>
-      resolve(tabs)));
-}
-
-
-function getTab(id) {
-  return new Promise(resolve =>
-    chrome.tabs.get(id, tab =>
-      !chrome.runtime.lastError && resolve(tab)));
-}
-
-
-function getOwnTab() {
-  return new Promise(resolve =>
-    chrome.tabs.getCurrent(tab => resolve(tab)));
-}
-
-
-function getActiveTab() {
-  return queryTabs({currentWindow: true, active: true})
-    .then(tabs => tabs[0]);
-}
-
-
-function getActiveTabRealURL() {
-  return getActiveTab()
-    .then(getTabRealURL);
-}
-
-
-function getTabRealURL(tab) {
-  return new Promise(resolve => {
-    if (tab.url != 'chrome://newtab/') {
-      resolve(tab.url);
-    } else {
-      chrome.webNavigation.getFrame({tabId: tab.id, frameId: 0, processId: -1}, frame => {
-        resolve(frame && frame.url || '');
-      });
-    }
-  });
-}
-
-
-// opens a tab or activates the already opened one,
-// reuses the New Tab page if it's focused now
-function openURL({url, currentWindow = true}) {
-  if (!url.includes('://')) {
-    url = chrome.runtime.getURL(url);
-  }
-  return new Promise(resolve => {
-    // [some] chromium forks don't handle their fake branded protocols
-    url = url.replace(/^(opera|vivaldi)/, 'chrome');
-    // FF doesn't handle moz-extension:// URLs (bug)
-    // API doesn't handle the hash-fragment part
-    const urlQuery = url.startsWith('moz-extension') ? undefined : url.replace(/#.*/, '');
-    queryTabs({url: urlQuery, currentWindow}).then(tabs => {
-      for (const tab of tabs) {
-        if (tab.url == url) {
-          activateTab(tab).then(resolve);
-          return;
-        }
-      }
-      getActiveTab().then(tab => {
-        if (tab && tab.url == 'chrome://newtab/'
-        // prevent redirecting incognito NTP to a chrome URL as it crashes Chrome
-        && (!url.startsWith('chrome') || !tab.incognito)) {
-          chrome.tabs.update({url}, resolve);
-        } else {
-          chrome.tabs.create(tab && !FIREFOX ? {url, openerTabId: tab.id} : {url}, resolve);
-        }
-      });
-    });
-  });
-}
-
-
-function activateTab(tab) {
-  return Promise.all([
-    new Promise(resolve => {
-      chrome.tabs.update(tab.id, {active: true}, resolve);
-    }),
-    new Promise(resolve => {
-      chrome.windows.update(tab.windowId, {focused: true}, resolve);
-    }),
-  ]);
-}
-
-
-function stringAsRegExp(s, flags) {
-  return new RegExp(s.replace(/[{}()[\]/\\.+?^$:=*!|]/g, '\\$&'), flags);
-}
-
-
-function ignoreChromeError() {
-  chrome.runtime.lastError; // eslint-disable-line no-unused-expressions
-}
-
-
-function getStyleWithNoCode(style) {
-  const stripped = Object.assign({}, style, {sections: []});
-  for (const section of style.sections) {
-    stripped.sections.push(Object.assign({}, section, {code: null}));
-  }
-  return stripped;
-}
-
-
-// js engine can't optimize the entire function if it contains try-catch
-// so we should keep it isolated from normal code in a minimal wrapper
-// Update: might get fixed in V8 TurboFan in the future
-function tryCatch(func, ...args) {
-  try {
-    return func(...args);
-  } catch (e) {}
-}
-
-
-function tryRegExp(regexp) {
-  try {
-    return new RegExp(regexp);
-  } catch (e) {}
-}
-
-
-function tryJSONparse(jsonString) {
-  try {
-    return JSON.parse(jsonString);
-  } catch (e) {}
-}
-
-
-const debounce = Object.assign((fn, delay, ...args) => {
-  clearTimeout(debounce.timers.get(fn));
-  debounce.timers.set(fn, setTimeout(debounce.run, delay, fn, ...args));
-}, {
-  timers: new Map(),
-  run(fn, ...args) {
-    debounce.timers.delete(fn);
-    fn(...args);
-  },
-  unregister(fn) {
-    clearTimeout(debounce.timers.get(fn));
-    debounce.timers.delete(fn);
-  },
-});
-
-
-function deepCopy(obj) {
-  return obj !== null && obj !== undefined && typeof obj == 'object'
-    ? deepMerge(typeof obj.slice == 'function' ? [] : {}, obj)
-    : obj;
-}
-
-
-function deepMerge(target, ...args) {
-  const isArray = typeof target.slice == 'function';
-  for (const obj of args) {
-    if (isArray && obj !== null && obj !== undefined) {
-      for (const element of obj) {
-        target.push(deepCopy(element));
-      }
-      continue;
-    }
-    for (const k in obj) {
-      const value = obj[k];
-      if (k in target && typeof value == 'object' && value !== null) {
-        deepMerge(target[k], value);
-      } else {
-        target[k] = deepCopy(value);
-      }
-    }
-  }
-  return target;
-}
-
-
-function sessionStorageHash(name) {
-  return {
-    name,
-    value: tryCatch(JSON.parse, sessionStorage[name]) || {},
-    set(k, v) {
-      this.value[k] = v;
-      this.updateStorage();
-    },
-    unset(k) {
-      delete this.value[k];
-      this.updateStorage();
-    },
-    updateStorage() {
-      sessionStorage[this.name] = JSON.stringify(this.value);
-    }
-  };
-}
-
-
-function onBackgroundReady() {
-  return BG && BG.getStyles ? Promise.resolve() : new Promise(function ping(resolve) {
-    chrome.runtime.sendMessage({method: 'healthCheck'}, health => {
-      if (health !== undefined) {
-        BG = chrome.extension.getBackgroundPage();
-        resolve();
-      } else {
-        setTimeout(ping, 0, resolve);
-      }
-    });
-  });
-}
-
-
-// in case Chrome haven't yet loaded the bg page and displays our page like edit/manage
-function getStylesSafe(options) {
-  return onBackgroundReady()
-    .then(() => BG.getStyles(options));
-}
-
-
-function saveStyleSafe(style) {
-  return onBackgroundReady()
-    .then(() => BG.saveStyle(BG.deepCopy(style)))
-    .then(savedStyle => {
-      if (style.notify === false) {
-        handleUpdate(savedStyle, style);
-      }
-      return savedStyle;
-    });
-}
-
-
-function deleteStyleSafe({id, notify = true} = {}) {
-  return onBackgroundReady()
-    .then(() => BG.deleteStyle({id, notify}))
-    .then(() => {
-      if (!notify) {
-        handleDelete(id);
-      }
-      return id;
-    });
-}
-
-
-function download(url) {
-  return new Promise((resolve, reject) => {
-    const xhr = new XMLHttpRequest();
-    xhr.timeout = 10e3;
-    xhr.onloadend = () => (xhr.status == 200
-      ? resolve(xhr.responseText)
-      : reject(xhr.status));
-    const [mainUrl, query] = url.split('?');
-    xhr.open(query ? 'POST' : 'GET', mainUrl, true);
-    xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
-    xhr.send(query);
-  });
-}
-
-
-function doTimeout(ms = 0, ...args) {
-  return ms > 0
-    ? () => new Promise(resolve => setTimeout(resolve, ms, ...args))
-    : new Promise(resolve => setTimeout(resolve, 0, ...args));
-}
-
-
-function invokeOrPostpone(isInvoke, fn, ...args) {
-  return isInvoke
-    ? fn(...args)
-    : setTimeout(invokeOrPostpone, 0, true, fn, ...args);
-}
+/* global BG: true, onRuntimeMessage, applyOnMessage, handleUpdate, handleDelete */
+'use strict';
+
+// keep message channel open for sendResponse in chrome.runtime.onMessage listener
+const KEEP_CHANNEL_OPEN = true;
+
+const FIREFOX = /Firefox/.test(navigator.userAgent);
+const OPERA = /OPR/.test(navigator.userAgent);
+
+const URLS = {
+  ownOrigin: chrome.runtime.getURL(''),
+
+  optionsUI: [
+    chrome.runtime.getURL('options/index.html'),
+    'chrome://extensions/?options=' + chrome.runtime.id,
+  ],
+
+  configureCommands:
+    OPERA ? 'opera://settings/configureCommands'
+          : 'chrome://extensions/configureCommands',
+
+  // CWS cannot be scripted in chromium, see ChromeExtensionsClient::IsScriptableURL
+  // https://cs.chromium.org/chromium/src/chrome/common/extensions/chrome_extensions_client.cc
+  chromeWebStore: FIREFOX ? 'https://addons.mozilla.org/' : (
+    OPERA ? 'https://addons.opera.com/' : 'https://chrome.google.com/webstore/'
+  ),
+
+  supported: new RegExp(
+    '^(file|ftps?|http)://|' +
+    `^https://${FIREFOX ? '(?!addons\\.mozilla\\.org)' : (
+      OPERA ? '(?!addons\\.opera\\.com)' : '(?!chrome\\.google\\.com/webstore)'
+    )}|` +
+    '^' + chrome.runtime.getURL('')),
+};
+
+let BG = chrome.extension.getBackgroundPage();
+
+if (!BG || BG != window) {
+  document.documentElement.classList.toggle('firefox', FIREFOX);
+  document.documentElement.classList.toggle('opera', OPERA);
+  // TODO: remove once our manifest's minimum_chrome_version is 50+
+  // Chrome 49 doesn't report own extension pages in webNavigation apparently
+  if (navigator.userAgent.includes('Chrome/49.')) {
+    getActiveTab().then(BG.updateIcon);
+  }
+}
+
+function notifyAllTabs(msg) {
+  const originalMessage = msg;
+  if (msg.method == 'styleUpdated' || msg.method == 'styleAdded') {
+    // apply/popup/manage use only meta for these two methods,
+    // editor may need the full code but can fetch it directly,
+    // so we send just the meta to avoid spamming lots of tabs with huge styles
+    msg = Object.assign({}, msg, {
+      style: getStyleWithNoCode(msg.style)
+    });
+  }
+  const affectsAll = !msg.affects || msg.affects.all;
+  const affectsOwnOriginOnly = !affectsAll && (msg.affects.editor || msg.affects.manager);
+  const affectsTabs = affectsAll || affectsOwnOriginOnly;
+  const affectsIcon = affectsAll || msg.affects.icon;
+  const affectsPopup = affectsAll || msg.affects.popup;
+  const affectsSelf = affectsPopup || msg.prefs;
+  if (affectsTabs || affectsIcon) {
+    const notifyTab = tab => {
+      // own pages will be notified via runtime.sendMessage later
+      if ((affectsTabs || URLS.optionsUI.includes(tab.url))
+      && !(affectsSelf && tab.url.startsWith(URLS.ownOrigin))
+      // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
+      && (!FIREFOX || tab.width)) {
+        chrome.tabs.sendMessage(tab.id, msg);
+      }
+      if (affectsIcon && BG) {
+        BG.updateIcon(tab);
+      }
+    };
+    // list all tabs including chrome-extension:// which can be ours
+    Promise.all([
+      queryTabs(affectsOwnOriginOnly ? {url: URLS.ownOrigin + '*'} : {}),
+      getActiveTab(),
+    ]).then(([tabs, activeTab]) => {
+      const activeTabId = activeTab && activeTab.id;
+      for (const tab of tabs) {
+        invokeOrPostpone(tab.id === activeTabId, notifyTab, tab);
+      }
+    });
+  }
+  // notify self: the message no longer is sent to the origin in new Chrome
+  if (typeof onRuntimeMessage != 'undefined') {
+    onRuntimeMessage(originalMessage);
+  }
+  // notify apply.js on own pages
+  if (typeof applyOnMessage != 'undefined') {
+    applyOnMessage(originalMessage);
+  }
+  // notify background page and all open popups
+  if (affectsSelf) {
+    chrome.runtime.sendMessage(msg);
+  }
+}
+
+
+function queryTabs(options = {}) {
+  return new Promise(resolve =>
+    chrome.tabs.query(options, tabs =>
+      resolve(tabs)));
+}
+
+
+function getTab(id) {
+  return new Promise(resolve =>
+    chrome.tabs.get(id, tab =>
+      !chrome.runtime.lastError && resolve(tab)));
+}
+
+
+function getOwnTab() {
+  return new Promise(resolve =>
+    chrome.tabs.getCurrent(tab => resolve(tab)));
+}
+
+
+function getActiveTab() {
+  return queryTabs({currentWindow: true, active: true})
+    .then(tabs => tabs[0]);
+}
+
+
+function getActiveTabRealURL() {
+  return getActiveTab()
+    .then(getTabRealURL);
+}
+
+
+function getTabRealURL(tab) {
+  return new Promise(resolve => {
+    if (tab.url != 'chrome://newtab/') {
+      resolve(tab.url);
+    } else {
+      chrome.webNavigation.getFrame({tabId: tab.id, frameId: 0, processId: -1}, frame => {
+        resolve(frame && frame.url || '');
+      });
+    }
+  });
+}
+
+
+// opens a tab or activates the already opened one,
+// reuses the New Tab page if it's focused now
+function openURL({url, currentWindow = true}) {
+  if (!url.includes('://')) {
+    url = chrome.runtime.getURL(url);
+  }
+  return new Promise(resolve => {
+    // [some] chromium forks don't handle their fake branded protocols
+    url = url.replace(/^(opera|vivaldi)/, 'chrome');
+    // FF doesn't handle moz-extension:// URLs (bug)
+    // API doesn't handle the hash-fragment part
+    const urlQuery = url.startsWith('moz-extension') ? undefined : url.replace(/#.*/, '');
+    queryTabs({url: urlQuery, currentWindow}).then(tabs => {
+      for (const tab of tabs) {
+        if (tab.url == url) {
+          activateTab(tab).then(resolve);
+          return;
+        }
+      }
+      getActiveTab().then(tab => {
+        if (tab && tab.url == 'chrome://newtab/'
+        // prevent redirecting incognito NTP to a chrome URL as it crashes Chrome
+        && (!url.startsWith('chrome') || !tab.incognito)) {
+          chrome.tabs.update({url}, resolve);
+        } else {
+          chrome.tabs.create(tab && !FIREFOX ? {url, openerTabId: tab.id} : {url}, resolve);
+        }
+      });
+    });
+  });
+}
+
+
+function activateTab(tab) {
+  return Promise.all([
+    new Promise(resolve => {
+      chrome.tabs.update(tab.id, {active: true}, resolve);
+    }),
+    new Promise(resolve => {
+      chrome.windows.update(tab.windowId, {focused: true}, resolve);
+    }),
+  ]);
+}
+
+
+function stringAsRegExp(s, flags) {
+  return new RegExp(s.replace(/[{}()[\]/\\.+?^$:=*!|]/g, '\\$&'), flags);
+}
+
+
+function ignoreChromeError() {
+  chrome.runtime.lastError; // eslint-disable-line no-unused-expressions
+}
+
+
+function getStyleWithNoCode(style) {
+  const stripped = Object.assign({}, style, {sections: []});
+  for (const section of style.sections) {
+    stripped.sections.push(Object.assign({}, section, {code: null}));
+  }
+  return stripped;
+}
+
+
+// js engine can't optimize the entire function if it contains try-catch
+// so we should keep it isolated from normal code in a minimal wrapper
+// Update: might get fixed in V8 TurboFan in the future
+function tryCatch(func, ...args) {
+  try {
+    return func(...args);
+  } catch (e) {}
+}
+
+
+function tryRegExp(regexp) {
+  try {
+    return new RegExp(regexp);
+  } catch (e) {}
+}
+
+
+function tryJSONparse(jsonString) {
+  try {
+    return JSON.parse(jsonString);
+  } catch (e) {}
+}
+
+
+const debounce = Object.assign((fn, delay, ...args) => {
+  clearTimeout(debounce.timers.get(fn));
+  debounce.timers.set(fn, setTimeout(debounce.run, delay, fn, ...args));
+}, {
+  timers: new Map(),
+  run(fn, ...args) {
+    debounce.timers.delete(fn);
+    fn(...args);
+  },
+  unregister(fn) {
+    clearTimeout(debounce.timers.get(fn));
+    debounce.timers.delete(fn);
+  },
+});
+
+
+function deepCopy(obj) {
+  return obj !== null && obj !== undefined && typeof obj == 'object'
+    ? deepMerge(typeof obj.slice == 'function' ? [] : {}, obj)
+    : obj;
+}
+
+
+function deepMerge(target, ...args) {
+  const isArray = typeof target.slice == 'function';
+  for (const obj of args) {
+    if (isArray && obj !== null && obj !== undefined) {
+      for (const element of obj) {
+        target.push(deepCopy(element));
+      }
+      continue;
+    }
+    for (const k in obj) {
+      const value = obj[k];
+      if (k in target && typeof value == 'object' && value !== null) {
+        deepMerge(target[k], value);
+      } else {
+        target[k] = deepCopy(value);
+      }
+    }
+  }
+  return target;
+}
+
+
+function sessionStorageHash(name) {
+  return {
+    name,
+    value: tryCatch(JSON.parse, sessionStorage[name]) || {},
+    set(k, v) {
+      this.value[k] = v;
+      this.updateStorage();
+    },
+    unset(k) {
+      delete this.value[k];
+      this.updateStorage();
+    },
+    updateStorage() {
+      sessionStorage[this.name] = JSON.stringify(this.value);
+    }
+  };
+}
+
+
+function onBackgroundReady() {
+  return BG && BG.getStyles ? Promise.resolve() : new Promise(function ping(resolve) {
+    chrome.runtime.sendMessage({method: 'healthCheck'}, health => {
+      if (health !== undefined) {
+        BG = chrome.extension.getBackgroundPage();
+        resolve();
+      } else {
+        setTimeout(ping, 0, resolve);
+      }
+    });
+  });
+}
+
+
+// in case Chrome haven't yet loaded the bg page and displays our page like edit/manage
+function getStylesSafe(options) {
+  return onBackgroundReady()
+    .then(() => BG.getStyles(options));
+}
+
+
+function saveStyleSafe(style) {
+  return onBackgroundReady()
+    .then(() => BG.saveStyle(BG.deepCopy(style)))
+    .then(savedStyle => {
+      if (style.notify === false) {
+        handleUpdate(savedStyle, style);
+      }
+      return savedStyle;
+    });
+}
+
+
+function deleteStyleSafe({id, notify = true} = {}) {
+  return onBackgroundReady()
+    .then(() => BG.deleteStyle({id, notify}))
+    .then(() => {
+      if (!notify) {
+        handleDelete(id);
+      }
+      return id;
+    });
+}
+
+
+function download(url) {
+  return new Promise((resolve, reject) => {
+    const xhr = new XMLHttpRequest();
+    xhr.timeout = 10e3;
+    xhr.onloadend = () => (xhr.status == 200
+      ? resolve(xhr.responseText)
+      : reject(xhr.status));
+    const [mainUrl, query] = url.split('?');
+    xhr.open(query ? 'POST' : 'GET', mainUrl, true);
+    xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+    xhr.send(query);
+  });
+}
+
+
+function doTimeout(ms = 0, ...args) {
+  return ms > 0
+    ? () => new Promise(resolve => setTimeout(resolve, ms, ...args))
+    : new Promise(resolve => setTimeout(resolve, 0, ...args));
+}
+
+
+function invokeOrPostpone(isInvoke, fn, ...args) {
+  return isInvoke
+    ? fn(...args)
+    : setTimeout(invokeOrPostpone, 0, true, fn, ...args);
+}
diff --git a/storage.js b/background/storage.js
similarity index 100%
rename from storage.js
rename to background/storage.js
diff --git a/update.js b/background/update.js
similarity index 100%
rename from update.js
rename to background/update.js
diff --git a/backup/fileSaveLoad.js b/backup/fileSaveLoad.js
deleted file mode 100644
index 7626a1b2..00000000
--- a/backup/fileSaveLoad.js
+++ /dev/null
@@ -1,395 +0,0 @@
-/* global messageBox, handleUpdate, applyOnMessage */
-'use strict';
-
-const STYLISH_DUMP_FILE_EXT = '.txt';
-const STYLUS_BACKUP_FILE_EXT = '.json';
-
-
-function importFromFile({fileTypeFilter, file} = {}) {
-  return new Promise(resolve => {
-    const fileInput = document.createElement('input');
-    if (file) {
-      readFile();
-      return;
-    }
-    fileInput.style.display = 'none';
-    fileInput.type = 'file';
-    fileInput.accept = fileTypeFilter || STYLISH_DUMP_FILE_EXT;
-    fileInput.acceptCharset = 'utf-8';
-
-    document.body.appendChild(fileInput);
-    fileInput.initialValue = fileInput.value;
-    fileInput.onchange = readFile;
-    fileInput.click();
-
-    function readFile() {
-      if (file || fileInput.value !== fileInput.initialValue) {
-        file = file || fileInput.files[0];
-        if (file.size > 100e6) {
-          console.warn("100MB backup? I don't believe you.");
-          importFromString('').then(resolve);
-          return;
-        }
-        document.body.style.cursor = 'wait';
-        const fReader = new FileReader();
-        fReader.onloadend = event => {
-          fileInput.remove();
-          importFromString(event.target.result).then(numStyles => {
-            document.body.style.cursor = '';
-            resolve(numStyles);
-          });
-        };
-        fReader.readAsText(file, 'utf-8');
-      }
-    }
-  });
-}
-
-
-function importFromString(jsonString) {
-  if (!BG) {
-    onBackgroundReady().then(() => importFromString(jsonString));
-    return;
-  }
-  // create objects in background context
-  const json = BG.tryJSONparse(jsonString) || [];
-  if (typeof json.slice != 'function') {
-    json.length = 0;
-  }
-  const oldStyles = json.length && BG.deepCopy(BG.cachedStyles.list || []);
-  const oldStylesByName = json.length && new Map(
-    oldStyles.map(style => [style.name.trim(), style]));
-
-  const stats = {
-    added:       {names: [], ids: [], legend: 'importReportLegendAdded'},
-    unchanged:   {names: [], ids: [], legend: 'importReportLegendIdentical'},
-    metaAndCode: {names: [], ids: [], legend: 'importReportLegendUpdatedBoth'},
-    metaOnly:    {names: [], ids: [], legend: 'importReportLegendUpdatedMeta'},
-    codeOnly:    {names: [], ids: [], legend: 'importReportLegendUpdatedCode'},
-    invalid:     {names: [], legend: 'importReportLegendInvalid'},
-  };
-
-  let index = 0;
-  let lastRenderTime = performance.now();
-  const renderQueue = [];
-  const RENDER_NAP_TIME_MAX = 1000; // ms
-  const RENDER_QUEUE_MAX = 50; // number of styles
-  const SAVE_OPTIONS = {reason: 'import', notify: false};
-
-  return new Promise(proceed);
-
-  function proceed(resolve) {
-    while (index < json.length) {
-      const item = json[index++];
-      const info = analyze(item);
-      if (info) {
-        // using saveStyle directly since json was parsed in background page context
-        return BG.saveStyle(Object.assign(item, SAVE_OPTIONS))
-          .then(style => account({style, info, resolve}));
-      }
-    }
-    renderQueue.forEach(style => handleUpdate(style, {reason: 'import'}));
-    renderQueue.length = 0;
-    done(resolve);
-  }
-
-  function analyze(item) {
-    if (!item || !item.name || !item.name.trim() || typeof item != 'object'
-    || (item.sections && typeof item.sections.slice != 'function')) {
-      stats.invalid.names.push(`#${index}: ${limitString(item && item.name || '')}`);
-      return;
-    }
-    item.name = item.name.trim();
-    const byId = BG.cachedStyles.byId.get(item.id);
-    const byName = oldStylesByName.get(item.name);
-    oldStylesByName.delete(item.name);
-    let oldStyle;
-    if (byId) {
-      if (sameStyle(byId, item)) {
-        oldStyle = byId;
-      } else {
-        item.id = null;
-      }
-    }
-    if (!oldStyle && byName) {
-      item.id = byName.id;
-      oldStyle = byName;
-    }
-    const oldStyleKeys = oldStyle && Object.keys(oldStyle);
-    const metaEqual = oldStyleKeys &&
-      oldStyleKeys.length == Object.keys(item).length &&
-      oldStyleKeys.every(k => k == 'sections' || oldStyle[k] === item[k]);
-    const codeEqual = oldStyle && BG.styleSectionsEqual(oldStyle, item);
-    if (metaEqual && codeEqual) {
-      stats.unchanged.names.push(oldStyle.name);
-      stats.unchanged.ids.push(oldStyle.id);
-      return;
-    }
-    return {oldStyle, metaEqual, codeEqual};
-  }
-
-  function sameStyle(oldStyle, newStyle) {
-    return oldStyle.name.trim() === newStyle.name.trim() ||
-      ['updateUrl', 'originalMd5', 'originalDigest']
-        .some(field => oldStyle[field] && oldStyle[field] == newStyle[field]);
-  }
-
-  function account({style, info, resolve}) {
-    renderQueue.push(style);
-    if (performance.now() - lastRenderTime > RENDER_NAP_TIME_MAX
-    || renderQueue.length > RENDER_QUEUE_MAX) {
-      renderQueue.forEach(style => handleUpdate(style, {reason: 'import'}));
-      setTimeout(scrollElementIntoView, 0, $('#style-' + renderQueue.pop().id));
-      renderQueue.length = 0;
-      lastRenderTime = performance.now();
-    }
-    setTimeout(proceed, 0, resolve);
-    const {oldStyle, metaEqual, codeEqual} = info;
-    if (!oldStyle) {
-      stats.added.names.push(style.name);
-      stats.added.ids.push(style.id);
-      return;
-    }
-    if (!metaEqual && !codeEqual) {
-      stats.metaAndCode.names.push(reportNameChange(oldStyle, style));
-      stats.metaAndCode.ids.push(style.id);
-      return;
-    }
-    if (!codeEqual) {
-      stats.codeOnly.names.push(style.name);
-      stats.codeOnly.ids.push(style.id);
-      return;
-    }
-    stats.metaOnly.names.push(reportNameChange(oldStyle, style));
-    stats.metaOnly.ids.push(style.id);
-  }
-
-  function done(resolve) {
-    const numChanged = stats.metaAndCode.names.length +
-      stats.metaOnly.names.length +
-      stats.codeOnly.names.length +
-      stats.added.names.length;
-    Promise.resolve(numChanged && refreshAllTabs()).then(() => {
-      const report = Object.keys(stats)
-        .filter(kind => stats[kind].names.length)
-        .map(kind => {
-          const {ids, names, legend} = stats[kind];
-          const listItemsWithId = (name, i) =>
-            $element({dataset: {id: ids[i]}, textContent: name});
-          const listItems = name =>
-            $element({textContent: name});
-          const block =
-            $element({tag: 'details', dataset: {id: kind}, appendChild: [
-              $element({tag: 'summary', appendChild:
-                $element({tag: 'b', textContent: names.length + ' ' + t(legend)})
-              }),
-              $element({tag: 'small', appendChild:
-                names.map(ids ? listItemsWithId : listItems)
-              }),
-            ]});
-          return block;
-        });
-      scrollTo(0, 0);
-      messageBox({
-        title: t('importReportTitle'),
-        contents: report.length ? report : t('importReportUnchanged'),
-        buttons: [t('confirmOK'), numChanged && t('undo')],
-        onshow:  bindClick,
-      }).then(({button, enter, esc}) => {
-        if (button == 1) {
-          undo();
-        }
-      });
-      resolve(numChanged);
-    });
-  }
-
-  function undo() {
-    const oldStylesById = new Map(oldStyles.map(style => [style.id, style]));
-    const newIds = [
-      ...stats.metaAndCode.ids,
-      ...stats.metaOnly.ids,
-      ...stats.codeOnly.ids,
-      ...stats.added.ids,
-    ];
-    let resolve;
-    index = 0;
-    return new Promise(resolve_ => {
-      resolve = resolve_;
-      undoNextId();
-    }).then(refreshAllTabs)
-      .then(() => messageBox({
-        title: t('importReportUndoneTitle'),
-        contents: newIds.length + ' ' + t('importReportUndone'),
-        buttons: [t('confirmOK')],
-      }));
-    function undoNextId() {
-      if (index == newIds.length) {
-        resolve();
-        return;
-      }
-      const id = newIds[index++];
-      deleteStyleSafe({id, notify: false}).then(id => {
-        const oldStyle = oldStylesById.get(id);
-        if (oldStyle) {
-          saveStyleSafe(Object.assign(oldStyle, SAVE_OPTIONS))
-            .then(undoNextId);
-        } else {
-          undoNextId();
-        }
-      });
-    }
-  }
-
-  function bindClick(box) {
-    const highlightElement = event => {
-      const styleElement = $('#style-' + event.target.dataset.id);
-      if (styleElement) {
-        scrollElementIntoView(styleElement);
-        animateElement(styleElement);
-      }
-    };
-    for (const block of $$('details')) {
-      if (block.dataset.id != 'invalid') {
-        block.style.cursor = 'pointer';
-        block.onclick = highlightElement;
-      }
-    }
-  }
-
-  function limitString(s, limit = 100) {
-    return s.length <= limit ? s : s.substr(0, limit) + '...';
-  }
-
-  function reportNameChange(oldStyle, newStyle) {
-    return newStyle.name != oldStyle.name
-      ? oldStyle.name + ' —> ' + newStyle.name
-      : oldStyle.name;
-  }
-
-  function refreshAllTabs() {
-    return Promise.all([
-      getActiveTab(),
-      getOwnTab(),
-    ]).then(([activeTab, ownTab]) => new Promise(resolve => {
-      // list all tabs including chrome-extension:// which can be ours
-      queryTabs().then(tabs => {
-        const lastTab = tabs[tabs.length - 1];
-        for (const tab of tabs) {
-          // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
-          if (FIREFOX && !tab.width) {
-            if (tab == lastTab) {
-              resolve();
-            }
-            continue;
-          }
-          getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
-            const message = {method: 'styleReplaceAll', styles};
-            if (tab.id == ownTab.id) {
-              applyOnMessage(message);
-            } else {
-              invokeOrPostpone(tab.id == activeTab.id,
-                chrome.tabs.sendMessage, tab.id, message, ignoreChromeError);
-            }
-            setTimeout(BG.updateIcon, 0, tab, styles);
-            if (tab == lastTab) {
-              resolve();
-            }
-          });
-        }
-      });
-    }));
-  }
-}
-
-
-$('#file-all-styles').onclick = () => {
-  getStylesSafe().then(styles => {
-    const text = JSON.stringify(styles, null, '\t');
-    const url = 'data:text/plain;charset=utf-8,' + encodeURIComponent(text);
-    return url;
-    // for long URLs; https://github.com/schomery/stylus/issues/13#issuecomment-284582600
-  }).then(fetch)
-    .then(res => res.blob())
-    .then(blob => {
-      const objectURL = URL.createObjectURL(blob);
-      let link = $element({
-        tag:'a',
-        href: objectURL,
-        type: 'application/json',
-        download: generateFileName(),
-      });
-      // TODO: remove the fallback when FF multi-process bug is fixed
-      if (!FIREFOX) {
-        link.dispatchEvent(new MouseEvent('click'));
-        setTimeout(() => URL.revokeObjectURL(objectURL));
-      } else {
-        const iframe = document.body.appendChild($element({
-          tag: 'iframe',
-          style: 'width: 0; height: 0; position: fixed; opacity: 0;'.replace(/;/g, '!important;'),
-        }));
-        doTimeout().then(() => {
-          link = iframe.contentDocument.importNode(link, true);
-          iframe.contentDocument.body.appendChild(link);
-        })
-        .then(doTimeout)
-        .then(() => link.dispatchEvent(new MouseEvent('click')))
-        .then(doTimeout(1000))
-        .then(() => {
-          URL.revokeObjectURL(objectURL);
-          iframe.remove();
-        });
-      }
-    });
-
-  function generateFileName() {
-    const today = new Date();
-    const dd = ('0' + today.getDate()).substr(-2);
-    const mm = ('0' + (today.getMonth() + 1)).substr(-2);
-    const yyyy = today.getFullYear();
-    return `stylus-${yyyy}-${mm}-${dd}${STYLUS_BACKUP_FILE_EXT}`;
-  }
-};
-
-
-$('#unfile-all-styles').onclick = () => {
-  importFromFile({fileTypeFilter: STYLUS_BACKUP_FILE_EXT});
-};
-
-Object.assign(document.body, {
-  ondragover(event) {
-    const hasFiles = event.dataTransfer.types.includes('Files');
-    event.dataTransfer.dropEffect = hasFiles || event.target.type == 'search' ? 'copy' : 'none';
-    this.classList.toggle('dropzone', hasFiles);
-    if (hasFiles) {
-      event.preventDefault();
-      clearTimeout(this.fadeoutTimer);
-      this.classList.remove('fadeout');
-    }
-  },
-  ondragend(event) {
-    animateElement(this, {className: 'fadeout', removeExtraClasses: ['dropzone']}).then(() => {
-      this.style.animationDuration = '';
-    });
-  },
-  ondragleave(event) {
-    try {
-      // in Firefox event.target could be XUL browser and hence there is no permission to access it
-      if (event.target === this) {
-        this.ondragend();
-      }
-    } catch (e) {
-      this.ondragend();
-    }
-  },
-  ondrop(event) {
-    this.ondragend();
-    if (event.dataTransfer.files.length) {
-      event.preventDefault();
-      if ($('#onlyUpdates input').checked) {
-        $('#onlyUpdates input').click();
-      }
-      importFromFile({file: event.dataTransfer.files[0]});
-    }
-  },
-});
diff --git a/apply.js b/content/apply.js
similarity index 100%
rename from apply.js
rename to content/apply.js
diff --git a/install.js b/content/install.js
similarity index 96%
rename from install.js
rename to content/install.js
index 7ce385e3..f8bba479 100644
--- a/install.js
+++ b/content/install.js
@@ -1,360 +1,360 @@
-'use strict';
-
-const CHROMIUM = /Chromium/.test(navigator.userAgent); // non-Windows Chromium
-const FIREFOX = /Firefox/.test(navigator.userAgent);
-const VIVALDI = /Vivaldi/.test(navigator.userAgent);
-const OPERA = /OPR/.test(navigator.userAgent);
-
-document.addEventListener('stylishUpdate', onUpdateClicked);
-document.addEventListener('stylishUpdateChrome', onUpdateClicked);
-document.addEventListener('stylishUpdateOpera', onUpdateClicked);
-
-document.addEventListener('stylishInstall', onInstallClicked);
-document.addEventListener('stylishInstallChrome', onInstallClicked);
-document.addEventListener('stylishInstallOpera', onInstallClicked);
-
-chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
-  // orphaned content script check
-  if (msg.method == 'ping') {
-    sendResponse(true);
-  }
-});
-
-// TODO: remove the following statement when USO is fixed
-document.documentElement.appendChild(document.createElement('script')).text = '(' +
-  function() {
-    let settings;
-    document.addEventListener('stylusFixBuggyUSOsettings', function _({detail}) {
-      document.removeEventListener('stylusFixBuggyUSOsettings', _);
-      settings = /\?/.test(detail) && new URLSearchParams(new URL(detail).search);
-    });
-    const originalResponseJson = Response.prototype.json;
-    Response.prototype.json = function(...args) {
-      return originalResponseJson.call(this, ...args).then(json => {
-        Response.prototype.json = originalResponseJson;
-        if (!settings || typeof ((json || {}).style_settings || {}).every != 'function') {
-          return json;
-        }
-        const images = new Map();
-        for (const jsonSetting of json.style_settings) {
-          let value = settings.get('ik-' + jsonSetting.install_key);
-          if (!value
-          || !jsonSetting.style_setting_options
-          || !jsonSetting.style_setting_options[0]) {
-            continue;
-          }
-          if (value.startsWith('ik-')) {
-            value = value.replace(/^ik-/, '');
-            const defaultItem = jsonSetting.style_setting_options.find(item => item.default);
-            if (!defaultItem || defaultItem.install_key != value) {
-              if (defaultItem) {
-                defaultItem.default = false;
-              }
-              jsonSetting.style_setting_options.some(item => {
-                if (item.install_key == value) {
-                  item.default = true;
-                  return true;
-                }
-              });
-            }
-          } else if (jsonSetting.setting_type == 'image') {
-            jsonSetting.style_setting_options.some(item => {
-              if (item.default) {
-                item.default = false;
-                return true;
-              }
-            });
-            images.set(jsonSetting.install_key, value);
-          } else {
-            const item = jsonSetting.style_setting_options[0];
-            if (item.value !== value && item.install_key == 'placeholder') {
-              item.value = value;
-            }
-          }
-        }
-        if (images.size) {
-          new MutationObserver((_, observer) => {
-            if (!document.getElementById('style-settings')) {
-              return;
-            }
-            observer.disconnect();
-            for (const [name, url] of images.entries()) {
-              const elRadio = document.querySelector(`input[name="ik-${name}"][value="user-url"]`);
-              const elUrl = elRadio && document.getElementById(elRadio.id.replace('url-choice', 'user-url'));
-              if (elUrl) {
-                elUrl.value = url;
-              }
-            }
-          }).observe(document, {childList: true, subtree: true});
-        }
-        return json;
-      });
-    };
-  } + ')()';
-
-// TODO: remove the following statement when USO pagination is fixed
-if (location.search.includes('category=')) {
-  document.addEventListener('DOMContentLoaded', function _() {
-    document.removeEventListener('DOMContentLoaded', _);
-    new MutationObserver((_, observer) => {
-      if (!document.getElementById('pagination')) {
-        return;
-      }
-      observer.disconnect();
-      const category = '&' + location.search.match(/category=[^&]+/)[0];
-      const links = document.querySelectorAll('#pagination a[href*="page="]:not([href*="category="])');
-      for (let i = 0; i < links.length; i++) {
-        links[i].href += category;
-      }
-    }).observe(document, {childList: true, subtree: true});
-  });
-}
-
-new MutationObserver((mutations, observer) => {
-  if (document.body) {
-    observer.disconnect();
-    // TODO: remove the following statement when USO pagination title is fixed
-    document.title = document.title.replace(/^\d+&category=/, '');
-    chrome.runtime.sendMessage({
-      method: 'getStyles',
-      url: getMeta('stylish-id-url') || location.href
-    }, checkUpdatability);
-  }
-}).observe(document.documentElement, {childList: true});
-
-/* since we are using "stylish-code-chrome" meta key on all browsers and
-  US.o does not provide "advanced settings" on this url if browser is not Chrome,
-  we need to fix this URL using "stylish-update-url" meta key
-*/
-function getStyleURL() {
-  const url = getMeta('stylish-code-chrome');
-  // TODO: remove when USO is fixed
-  const directUrl = getMeta('stylish-update-url');
-  if (directUrl.includes('?') && !url.includes('?')) {
-    /* get custom settings from the update url */
-    return Object.assign(new URL(url), {
-      search: (new URL(directUrl)).search
-    }).href;
-  }
-  return url;
-}
-
-function checkUpdatability([installedStyle]) {
-  // TODO: remove the following statement when USO is fixed
-  document.dispatchEvent(new CustomEvent('stylusFixBuggyUSOsettings', {
-    detail: installedStyle && installedStyle.updateUrl,
-  }));
-  if (!installedStyle) {
-    sendEvent('styleCanBeInstalledChrome');
-    return;
-  }
-  const md5Url = getMeta('stylish-md5-url');
-  if (md5Url && installedStyle.md5Url && installedStyle.originalMd5) {
-    getResource(md5Url).then(md5 => {
-      reportUpdatable(md5 != installedStyle.originalMd5);
-    });
-  } else {
-    getResource(getStyleURL()).then(code => {
-      reportUpdatable(code === null ||
-        !styleSectionsEqual(JSON.parse(code), installedStyle));
-    });
-  }
-
-  function reportUpdatable(isUpdatable) {
-    sendEvent(
-      isUpdatable
-        ? 'styleCanBeUpdatedChrome'
-        : 'styleAlreadyInstalledChrome',
-      {
-        updateUrl: installedStyle.updateUrl
-      }
-    );
-  }
-}
-
-
-function sendEvent(type, detail = null) {
-  if (FIREFOX) {
-    type = type.replace('Chrome', '');
-  } else if (OPERA || VIVALDI) {
-    type = type.replace('Chrome', 'Opera');
-  }
-  detail = {detail};
-  if (typeof cloneInto != 'undefined') {
-    // Firefox requires explicit cloning, however USO can't process our messages anyway
-    // because USO tries to use a global "event" variable deprecated in Firefox
-    detail = cloneInto(detail, document); // eslint-disable-line no-undef
-  }
-  onDOMready().then(() => {
-    document.dispatchEvent(new CustomEvent(type, detail));
-  });
-}
-
-
-function onInstallClicked() {
-  if (!orphanCheck || !orphanCheck()) {
-    return;
-  }
-  getResource(getMeta('stylish-description'))
-    .then(name => saveStyleCode('styleInstall', name))
-    .then(() => getResource(getMeta('stylish-install-ping-url-chrome')));
-}
-
-
-function onUpdateClicked() {
-  if (!orphanCheck || !orphanCheck()) {
-    return;
-  }
-  chrome.runtime.sendMessage({
-    method: 'getStyles',
-    url: getMeta('stylish-id-url') || location.href,
-  }, ([style]) => {
-    saveStyleCode('styleUpdate', style.name, {id: style.id});
-  });
-}
-
-
-function saveStyleCode(message, name, addProps) {
-  return new Promise(resolve => {
-    if (!confirm(chrome.i18n.getMessage(message, [name]))) {
-      return;
-    }
-    enableUpdateButton(false);
-    getResource(getStyleURL()).then(code => {
-      chrome.runtime.sendMessage(
-        Object.assign(JSON.parse(code), addProps, {
-          method: 'saveStyle',
-          reason: 'update',
-        }),
-        style => {
-          if (message == 'styleUpdate' && style.updateUrl.includes('?')) {
-            enableUpdateButton(true);
-          } else {
-            sendEvent('styleInstalledChrome');
-          }
-        }
-      );
-      resolve();
-    });
-  });
-
-  function enableUpdateButton(state) {
-    const button = document.getElementById('update_style_button');
-    if (button) {
-      button.style.cssText = state ? '' :
-        'pointer-events: none !important; opacity: .25 !important;';
-    }
-  }
-}
-
-
-function getMeta(name) {
-  const e = document.querySelector(`link[rel="${name}"]`);
-  return e ? e.getAttribute('href') : null;
-}
-
-
-function getResource(url) {
-  return new Promise(resolve => {
-    if (url.startsWith('#')) {
-      resolve(document.getElementById(url.slice(1)).textContent);
-    } else {
-      chrome.runtime.sendMessage({method: 'download', url}, resolve);
-    }
-  });
-}
-
-
-function styleSectionsEqual({sections: a}, {sections: b}) {
-  if (!a || !b) {
-    return undefined;
-  }
-  if (a.length != b.length) {
-    return false;
-  }
-  const checkedInB = [];
-  return a.every(sectionA => b.some(sectionB => {
-    if (!checkedInB.includes(sectionB) && propertiesEqual(sectionA, sectionB)) {
-      checkedInB.push(sectionB);
-      return true;
-    }
-  }));
-
-  function propertiesEqual(secA, secB) {
-    for (const name of ['urlPrefixes', 'urls', 'domains', 'regexps']) {
-      if (!equalOrEmpty(secA[name], secB[name], 'every', arrayMirrors)) {
-        return false;
-      }
-    }
-    return equalOrEmpty(secA.code, secB.code, 'substr', (a, b) => a == b);
-  }
-
-  function equalOrEmpty(a, b, telltale, comparator) {
-    const typeA = a && typeof a[telltale] == 'function';
-    const typeB = b && typeof b[telltale] == 'function';
-    return (
-      (a === null || a === undefined || (typeA && !a.length)) &&
-      (b === null || b === undefined || (typeB && !b.length))
-    ) || typeA && typeB && a.length == b.length && comparator(a, b);
-  }
-
-  function arrayMirrors(array1, array2) {
-    for (const el of array1) {
-      if (array2.indexOf(el) < 0) {
-        return false;
-      }
-    }
-    for (const el of array2) {
-      if (array1.indexOf(el) < 0) {
-        return false;
-      }
-    }
-    return true;
-  }
-}
-
-
-function onDOMready() {
-  if (document.readyState != 'loading') {
-    return Promise.resolve();
-  }
-  return new Promise(resolve => {
-    document.addEventListener('DOMContentLoaded', function _() {
-      document.removeEventListener('DOMContentLoaded', _);
-      resolve();
-    });
-  });
-}
-
-
-function orphanCheck() {
-  const port = chrome.runtime.connect();
-  if (port) {
-    port.disconnect();
-    return true;
-  }
-  // we're orphaned due to an extension update
-  // we can detach event listeners
-  document.removeEventListener('stylishUpdate', onUpdateClicked);
-  document.removeEventListener('stylishUpdateChrome', onUpdateClicked);
-  document.removeEventListener('stylishUpdateOpera', onUpdateClicked);
-
-  document.removeEventListener('stylishInstall', onInstallClicked);
-  document.removeEventListener('stylishInstallChrome', onInstallClicked);
-  document.removeEventListener('stylishInstallOpera', onInstallClicked);
-
-  // we can't detach chrome.runtime.onMessage because it's no longer connected internally
-  // we can destroy global functions in this context to free up memory
-  [
-    'checkUpdatability',
-    'getMeta',
-    'getResource',
-    'onDOMready',
-    'onInstallClicked',
-    'onUpdateClicked',
-    'orphanCheck',
-    'saveStyleCode',
-    'sendEvent',
-    'styleSectionsEqual',
-  ].forEach(fn => (window[fn] = null));
-}
+'use strict';
+
+const CHROMIUM = /Chromium/.test(navigator.userAgent); // non-Windows Chromium
+const FIREFOX = /Firefox/.test(navigator.userAgent);
+const VIVALDI = /Vivaldi/.test(navigator.userAgent);
+const OPERA = /OPR/.test(navigator.userAgent);
+
+document.addEventListener('stylishUpdate', onUpdateClicked);
+document.addEventListener('stylishUpdateChrome', onUpdateClicked);
+document.addEventListener('stylishUpdateOpera', onUpdateClicked);
+
+document.addEventListener('stylishInstall', onInstallClicked);
+document.addEventListener('stylishInstallChrome', onInstallClicked);
+document.addEventListener('stylishInstallOpera', onInstallClicked);
+
+chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
+  // orphaned content script check
+  if (msg.method == 'ping') {
+    sendResponse(true);
+  }
+});
+
+// TODO: remove the following statement when USO is fixed
+document.documentElement.appendChild(document.createElement('script')).text = '(' +
+  function() {
+    let settings;
+    document.addEventListener('stylusFixBuggyUSOsettings', function _({detail}) {
+      document.removeEventListener('stylusFixBuggyUSOsettings', _);
+      settings = /\?/.test(detail) && new URLSearchParams(new URL(detail).search);
+    });
+    const originalResponseJson = Response.prototype.json;
+    Response.prototype.json = function(...args) {
+      return originalResponseJson.call(this, ...args).then(json => {
+        Response.prototype.json = originalResponseJson;
+        if (!settings || typeof ((json || {}).style_settings || {}).every != 'function') {
+          return json;
+        }
+        const images = new Map();
+        for (const jsonSetting of json.style_settings) {
+          let value = settings.get('ik-' + jsonSetting.install_key);
+          if (!value
+          || !jsonSetting.style_setting_options
+          || !jsonSetting.style_setting_options[0]) {
+            continue;
+          }
+          if (value.startsWith('ik-')) {
+            value = value.replace(/^ik-/, '');
+            const defaultItem = jsonSetting.style_setting_options.find(item => item.default);
+            if (!defaultItem || defaultItem.install_key != value) {
+              if (defaultItem) {
+                defaultItem.default = false;
+              }
+              jsonSetting.style_setting_options.some(item => {
+                if (item.install_key == value) {
+                  item.default = true;
+                  return true;
+                }
+              });
+            }
+          } else if (jsonSetting.setting_type == 'image') {
+            jsonSetting.style_setting_options.some(item => {
+              if (item.default) {
+                item.default = false;
+                return true;
+              }
+            });
+            images.set(jsonSetting.install_key, value);
+          } else {
+            const item = jsonSetting.style_setting_options[0];
+            if (item.value !== value && item.install_key == 'placeholder') {
+              item.value = value;
+            }
+          }
+        }
+        if (images.size) {
+          new MutationObserver((_, observer) => {
+            if (!document.getElementById('style-settings')) {
+              return;
+            }
+            observer.disconnect();
+            for (const [name, url] of images.entries()) {
+              const elRadio = document.querySelector(`input[name="ik-${name}"][value="user-url"]`);
+              const elUrl = elRadio && document.getElementById(elRadio.id.replace('url-choice', 'user-url'));
+              if (elUrl) {
+                elUrl.value = url;
+              }
+            }
+          }).observe(document, {childList: true, subtree: true});
+        }
+        return json;
+      });
+    };
+  } + ')()';
+
+// TODO: remove the following statement when USO pagination is fixed
+if (location.search.includes('category=')) {
+  document.addEventListener('DOMContentLoaded', function _() {
+    document.removeEventListener('DOMContentLoaded', _);
+    new MutationObserver((_, observer) => {
+      if (!document.getElementById('pagination')) {
+        return;
+      }
+      observer.disconnect();
+      const category = '&' + location.search.match(/category=[^&]+/)[0];
+      const links = document.querySelectorAll('#pagination a[href*="page="]:not([href*="category="])');
+      for (let i = 0; i < links.length; i++) {
+        links[i].href += category;
+      }
+    }).observe(document, {childList: true, subtree: true});
+  });
+}
+
+new MutationObserver((mutations, observer) => {
+  if (document.body) {
+    observer.disconnect();
+    // TODO: remove the following statement when USO pagination title is fixed
+    document.title = document.title.replace(/^\d+&category=/, '');
+    chrome.runtime.sendMessage({
+      method: 'getStyles',
+      url: getMeta('stylish-id-url') || location.href
+    }, checkUpdatability);
+  }
+}).observe(document.documentElement, {childList: true});
+
+/* since we are using "stylish-code-chrome" meta key on all browsers and
+  US.o does not provide "advanced settings" on this url if browser is not Chrome,
+  we need to fix this URL using "stylish-update-url" meta key
+*/
+function getStyleURL() {
+  const url = getMeta('stylish-code-chrome');
+  // TODO: remove when USO is fixed
+  const directUrl = getMeta('stylish-update-url');
+  if (directUrl.includes('?') && !url.includes('?')) {
+    /* get custom settings from the update url */
+    return Object.assign(new URL(url), {
+      search: (new URL(directUrl)).search
+    }).href;
+  }
+  return url;
+}
+
+function checkUpdatability([installedStyle]) {
+  // TODO: remove the following statement when USO is fixed
+  document.dispatchEvent(new CustomEvent('stylusFixBuggyUSOsettings', {
+    detail: installedStyle && installedStyle.updateUrl,
+  }));
+  if (!installedStyle) {
+    sendEvent('styleCanBeInstalledChrome');
+    return;
+  }
+  const md5Url = getMeta('stylish-md5-url');
+  if (md5Url && installedStyle.md5Url && installedStyle.originalMd5) {
+    getResource(md5Url).then(md5 => {
+      reportUpdatable(md5 != installedStyle.originalMd5);
+    });
+  } else {
+    getResource(getStyleURL()).then(code => {
+      reportUpdatable(code === null ||
+        !styleSectionsEqual(JSON.parse(code), installedStyle));
+    });
+  }
+
+  function reportUpdatable(isUpdatable) {
+    sendEvent(
+      isUpdatable
+        ? 'styleCanBeUpdatedChrome'
+        : 'styleAlreadyInstalledChrome',
+      {
+        updateUrl: installedStyle.updateUrl
+      }
+    );
+  }
+}
+
+
+function sendEvent(type, detail = null) {
+  if (FIREFOX) {
+    type = type.replace('Chrome', '');
+  } else if (OPERA || VIVALDI) {
+    type = type.replace('Chrome', 'Opera');
+  }
+  detail = {detail};
+  if (typeof cloneInto != 'undefined') {
+    // Firefox requires explicit cloning, however USO can't process our messages anyway
+    // because USO tries to use a global "event" variable deprecated in Firefox
+    detail = cloneInto(detail, document); // eslint-disable-line no-undef
+  }
+  onDOMready().then(() => {
+    document.dispatchEvent(new CustomEvent(type, detail));
+  });
+}
+
+
+function onInstallClicked() {
+  if (!orphanCheck || !orphanCheck()) {
+    return;
+  }
+  getResource(getMeta('stylish-description'))
+    .then(name => saveStyleCode('styleInstall', name))
+    .then(() => getResource(getMeta('stylish-install-ping-url-chrome')));
+}
+
+
+function onUpdateClicked() {
+  if (!orphanCheck || !orphanCheck()) {
+    return;
+  }
+  chrome.runtime.sendMessage({
+    method: 'getStyles',
+    url: getMeta('stylish-id-url') || location.href,
+  }, ([style]) => {
+    saveStyleCode('styleUpdate', style.name, {id: style.id});
+  });
+}
+
+
+function saveStyleCode(message, name, addProps) {
+  return new Promise(resolve => {
+    if (!confirm(chrome.i18n.getMessage(message, [name]))) {
+      return;
+    }
+    enableUpdateButton(false);
+    getResource(getStyleURL()).then(code => {
+      chrome.runtime.sendMessage(
+        Object.assign(JSON.parse(code), addProps, {
+          method: 'saveStyle',
+          reason: 'update',
+        }),
+        style => {
+          if (message == 'styleUpdate' && style.updateUrl.includes('?')) {
+            enableUpdateButton(true);
+          } else {
+            sendEvent('styleInstalledChrome');
+          }
+        }
+      );
+      resolve();
+    });
+  });
+
+  function enableUpdateButton(state) {
+    const button = document.getElementById('update_style_button');
+    if (button) {
+      button.style.cssText = state ? '' :
+        'pointer-events: none !important; opacity: .25 !important;';
+    }
+  }
+}
+
+
+function getMeta(name) {
+  const e = document.querySelector(`link[rel="${name}"]`);
+  return e ? e.getAttribute('href') : null;
+}
+
+
+function getResource(url) {
+  return new Promise(resolve => {
+    if (url.startsWith('#')) {
+      resolve(document.getElementById(url.slice(1)).textContent);
+    } else {
+      chrome.runtime.sendMessage({method: 'download', url}, resolve);
+    }
+  });
+}
+
+
+function styleSectionsEqual({sections: a}, {sections: b}) {
+  if (!a || !b) {
+    return undefined;
+  }
+  if (a.length != b.length) {
+    return false;
+  }
+  const checkedInB = [];
+  return a.every(sectionA => b.some(sectionB => {
+    if (!checkedInB.includes(sectionB) && propertiesEqual(sectionA, sectionB)) {
+      checkedInB.push(sectionB);
+      return true;
+    }
+  }));
+
+  function propertiesEqual(secA, secB) {
+    for (const name of ['urlPrefixes', 'urls', 'domains', 'regexps']) {
+      if (!equalOrEmpty(secA[name], secB[name], 'every', arrayMirrors)) {
+        return false;
+      }
+    }
+    return equalOrEmpty(secA.code, secB.code, 'substr', (a, b) => a == b);
+  }
+
+  function equalOrEmpty(a, b, telltale, comparator) {
+    const typeA = a && typeof a[telltale] == 'function';
+    const typeB = b && typeof b[telltale] == 'function';
+    return (
+      (a === null || a === undefined || (typeA && !a.length)) &&
+      (b === null || b === undefined || (typeB && !b.length))
+    ) || typeA && typeB && a.length == b.length && comparator(a, b);
+  }
+
+  function arrayMirrors(array1, array2) {
+    for (const el of array1) {
+      if (array2.indexOf(el) < 0) {
+        return false;
+      }
+    }
+    for (const el of array2) {
+      if (array1.indexOf(el) < 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
+
+
+function onDOMready() {
+  if (document.readyState != 'loading') {
+    return Promise.resolve();
+  }
+  return new Promise(resolve => {
+    document.addEventListener('DOMContentLoaded', function _() {
+      document.removeEventListener('DOMContentLoaded', _);
+      resolve();
+    });
+  });
+}
+
+
+function orphanCheck() {
+  const port = chrome.runtime.connect();
+  if (port) {
+    port.disconnect();
+    return true;
+  }
+  // we're orphaned due to an extension update
+  // we can detach event listeners
+  document.removeEventListener('stylishUpdate', onUpdateClicked);
+  document.removeEventListener('stylishUpdateChrome', onUpdateClicked);
+  document.removeEventListener('stylishUpdateOpera', onUpdateClicked);
+
+  document.removeEventListener('stylishInstall', onInstallClicked);
+  document.removeEventListener('stylishInstallChrome', onInstallClicked);
+  document.removeEventListener('stylishInstallOpera', onInstallClicked);
+
+  // we can't detach chrome.runtime.onMessage because it's no longer connected internally
+  // we can destroy global functions in this context to free up memory
+  [
+    'checkUpdatability',
+    'getMeta',
+    'getResource',
+    'onDOMready',
+    'onInstallClicked',
+    'onUpdateClicked',
+    'orphanCheck',
+    'saveStyleCode',
+    'sendEvent',
+    'styleSectionsEqual',
+  ].forEach(fn => (window[fn] = null));
+}
diff --git a/edit.js b/edit/edit.js
similarity index 100%
rename from edit.js
rename to edit/edit.js
diff --git a/options/index.html b/index.html
similarity index 100%
rename from options/index.html
rename to index.html
diff --git a/dom.js b/js/dom.js
similarity index 100%
rename from dom.js
rename to js/dom.js
diff --git a/localization.js b/js/localization.js
similarity index 100%
rename from localization.js
rename to js/localization.js
diff --git a/prefs.js b/js/prefs.js
similarity index 100%
rename from prefs.js
rename to js/prefs.js
diff --git a/manage/fileSaveLoad.js b/manage/fileSaveLoad.js
new file mode 100644
index 00000000..125ed9e0
--- /dev/null
+++ b/manage/fileSaveLoad.js
@@ -0,0 +1,791 @@
+/* global messageBox, handleUpdate, applyOnMessage */
+'use strict';
+
+const STYLISH_DUMP_FILE_EXT = '.txt';
+const STYLUS_BACKUP_FILE_EXT = '.json';
+
+
+function importFromFile({fileTypeFilter, file} = {}) {
+  return new Promise(resolve => {
+    const fileInput = document.createElement('input');
+    if (file) {
+      readFile();
+      return;
+    }
+    fileInput.style.display = 'none';
+    fileInput.type = 'file';
+    fileInput.accept = fileTypeFilter || STYLISH_DUMP_FILE_EXT;
+    fileInput.acceptCharset = 'utf-8';
+
+    document.body.appendChild(fileInput);
+    fileInput.initialValue = fileInput.value;
+    fileInput.onchange = readFile;
+    fileInput.click();
+
+    function readFile() {
+      if (file || fileInput.value !== fileInput.initialValue) {
+        file = file || fileInput.files[0];
+        if (file.size > 100e6) {
+          console.warn("100MB backup? I don't believe you.");
+          importFromString('').then(resolve);
+          return;
+        }
+        document.body.style.cursor = 'wait';
+        const fReader = new FileReader();
+        fReader.onloadend = event => {
+          fileInput.remove();
+          importFromString(event.target.result).then(numStyles => {
+            document.body.style.cursor = '';
+            resolve(numStyles);
+          });
+        };
+        fReader.readAsText(file, 'utf-8');
+      }
+    }
+  });
+}
+
+
+function importFromString(jsonString) {
+  if (!BG) {
+    onBackgroundReady().then(() => importFromString(jsonString));
+    return;
+  }
+  // create objects in background context
+  const json = BG.tryJSONparse(jsonString) || [];
+  if (typeof json.slice != 'function') {
+    json.length = 0;
+  }
+  const oldStyles = json.length && BG.deepCopy(BG.cachedStyles.list || []);
+  const oldStylesByName = json.length && new Map(
+    oldStyles.map(style => [style.name.trim(), style]));
+
+  const stats = {
+    added:       {names: [], ids: [], legend: 'importReportLegendAdded'},
+    unchanged:   {names: [], ids: [], legend: 'importReportLegendIdentical'},
+    metaAndCode: {names: [], ids: [], legend: 'importReportLegendUpdatedBoth'},
+    metaOnly:    {names: [], ids: [], legend: 'importReportLegendUpdatedMeta'},
+    codeOnly:    {names: [], ids: [], legend: 'importReportLegendUpdatedCode'},
+    invalid:     {names: [], legend: 'importReportLegendInvalid'},
+  };
+
+  let index = 0;
+  let lastRenderTime = performance.now();
+  const renderQueue = [];
+  const RENDER_NAP_TIME_MAX = 1000; // ms
+  const RENDER_QUEUE_MAX = 50; // number of styles
+  const SAVE_OPTIONS = {reason: 'import', notify: false};
+
+  return new Promise(proceed);
+
+  function proceed(resolve) {
+    while (index < json.length) {
+      const item = json[index++];
+      const info = analyze(item);
+      if (info) {
+        // using saveStyle directly since json was parsed in background page context
+        return BG.saveStyle(Object.assign(item, SAVE_OPTIONS))
+          .then(style => account({style, info, resolve}));
+      }
+    }
+    renderQueue.forEach(style => handleUpdate(style, {reason: 'import'}));
+    renderQueue.length = 0;
+    done(resolve);
+  }
+
+  function analyze(item) {
+    if (!item || !item.name || !item.name.trim() || typeof item != 'object'
+    || (item.sections && typeof item.sections.slice != 'function')) {
+      stats.invalid.names.push(`#${index}: ${limitString(item && item.name || '')}`);
+      return;
+    }
+    item.name = item.name.trim();
+    const byId = BG.cachedStyles.byId.get(item.id);
+    const byName = oldStylesByName.get(item.name);
+    oldStylesByName.delete(item.name);
+    let oldStyle;
+    if (byId) {
+      if (sameStyle(byId, item)) {
+        oldStyle = byId;
+      } else {
+        item.id = null;
+      }
+    }
+    if (!oldStyle && byName) {
+      item.id = byName.id;
+      oldStyle = byName;
+    }
+    const oldStyleKeys = oldStyle && Object.keys(oldStyle);
+    const metaEqual = oldStyleKeys &&
+      oldStyleKeys.length == Object.keys(item).length &&
+      oldStyleKeys.every(k => k == 'sections' || oldStyle[k] === item[k]);
+    const codeEqual = oldStyle && BG.styleSectionsEqual(oldStyle, item);
+    if (metaEqual && codeEqual) {
+      stats.unchanged.names.push(oldStyle.name);
+      stats.unchanged.ids.push(oldStyle.id);
+      return;
+    }
+    return {oldStyle, metaEqual, codeEqual};
+  }
+
+  function sameStyle(oldStyle, newStyle) {
+    return oldStyle.name.trim() === newStyle.name.trim() ||
+      ['updateUrl', 'originalMd5', 'originalDigest']
+        .some(field => oldStyle[field] && oldStyle[field] == newStyle[field]);
+  }
+
+  function account({style, info, resolve}) {
+    renderQueue.push(style);
+    if (performance.now() - lastRenderTime > RENDER_NAP_TIME_MAX
+    || renderQueue.length > RENDER_QUEUE_MAX) {
+      renderQueue.forEach(style => handleUpdate(style, {reason: 'import'}));
+      setTimeout(scrollElementIntoView, 0, $('#style-' + renderQueue.pop().id));
+      renderQueue.length = 0;
+      lastRenderTime = performance.now();
+    }
+    setTimeout(proceed, 0, resolve);
+    const {oldStyle, metaEqual, codeEqual} = info;
+    if (!oldStyle) {
+      stats.added.names.push(style.name);
+      stats.added.ids.push(style.id);
+      return;
+    }
+    if (!metaEqual && !codeEqual) {
+      stats.metaAndCode.names.push(reportNameChange(oldStyle, style));
+      stats.metaAndCode.ids.push(style.id);
+      return;
+    }
+    if (!codeEqual) {
+      stats.codeOnly.names.push(style.name);
+      stats.codeOnly.ids.push(style.id);
+      return;
+    }
+    stats.metaOnly.names.push(reportNameChange(oldStyle, style));
+    stats.metaOnly.ids.push(style.id);
+  }
+
+  function done(resolve) {
+    const numChanged = stats.metaAndCode.names.length +
+      stats.metaOnly.names.length +
+      stats.codeOnly.names.length +
+      stats.added.names.length;
+    Promise.resolve(numChanged && refreshAllTabs()).then(() => {
+      const report = Object.keys(stats)
+        .filter(kind => stats[kind].names.length)
+        .map(kind => {
+          const {ids, names, legend} = stats[kind];
+          const listItemsWithId = (name, i) =>
+            $element({dataset: {id: ids[i]}, textContent: name});
+          const listItems = name =>
+            $element({textContent: name});
+          const block =
+            $element({tag: 'details', dataset: {id: kind}, appendChild: [
+              $element({tag: 'summary', appendChild:
+                $element({tag: 'b', textContent: names.length + ' ' + t(legend)})
+              }),
+              $element({tag: 'small', appendChild:
+                names.map(ids ? listItemsWithId : listItems)
+              }),
+            ]});
+          return block;
+        });
+      scrollTo(0, 0);
+      messageBox({
+        title: t('importReportTitle'),
+        contents: report.length ? report : t('importReportUnchanged'),
+        buttons: [t('confirmOK'), numChanged && t('undo')],
+        onshow:  bindClick,
+      }).then(({button, enter, esc}) => {
+        if (button == 1) {
+          undo();
+        }
+      });
+      resolve(numChanged);
+    });
+  }
+
+  function undo() {
+    const oldStylesById = new Map(oldStyles.map(style => [style.id, style]));
+    const newIds = [
+      ...stats.metaAndCode.ids,
+      ...stats.metaOnly.ids,
+      ...stats.codeOnly.ids,
+      ...stats.added.ids,
+    ];
+    let resolve;
+    index = 0;
+    return new Promise(resolve_ => {
+      resolve = resolve_;
+      undoNextId();
+    }).then(refreshAllTabs)
+      .then(() => messageBox({
+        title: t('importReportUndoneTitle'),
+        contents: newIds.length + ' ' + t('importReportUndone'),
+        buttons: [t('confirmOK')],
+      }));
+    function undoNextId() {
+      if (index == newIds.length) {
+        resolve();
+        return;
+      }
+      const id = newIds[index++];
+      deleteStyleSafe({id, notify: false}).then(id => {
+        const oldStyle = oldStylesById.get(id);
+        if (oldStyle) {
+          saveStyleSafe(Object.assign(oldStyle, SAVE_OPTIONS))
+            .then(undoNextId);
+        } else {
+          undoNextId();
+        }
+      });
+    }
+  }
+
+  function bindClick(box) {
+    const highlightElement = event => {
+      const styleElement = $('#style-' + event.target.dataset.id);
+      if (styleElement) {
+        scrollElementIntoView(styleElement);
+        animateElement(styleElement);
+      }
+    };
+    for (const block of $$('details')) {
+      if (block.dataset.id != 'invalid') {
+        block.style.cursor = 'pointer';
+        block.onclick = highlightElement;
+      }
+    }
+  }
+
+  function limitString(s, limit = 100) {
+    return s.length <= limit ? s : s.substr(0, limit) + '...';
+  }
+
+  function reportNameChange(oldStyle, newStyle) {
+    return newStyle.name != oldStyle.name
+      ? oldStyle.name + ' —> ' + newStyle.name
+      : oldStyle.name;
+  }
+
+  function refreshAllTabs() {
+    return Promise.all([
+      getActiveTab(),
+      getOwnTab(),
+    ]).then(([activeTab, ownTab]) => new Promise(resolve => {
+      // list all tabs including chrome-extension:// which can be ours
+      queryTabs().then(tabs => {
+        const lastTab = tabs[tabs.length - 1];
+        for (const tab of tabs) {
+          // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
+          if (FIREFOX && !tab.width) {
+            if (tab == lastTab) {
+              resolve();
+            }
+            continue;
+          }
+          getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
+            const message = {method: 'styleReplaceAll', styles};
+            if (tab.id == ownTab.id) {
+              applyOnMessage(message);
+            } else {
+              invokeOrPostpone(tab.id == activeTab.id,
+                chrome.tabs.sendMessage, tab.id, message, ignoreChromeError);
+            }
+            setTimeout(BG.updateIcon, 0, tab, styles);
+            if (tab == lastTab) {
+              resolve();
+            }
+          });
+        }
+      });
+    }));
+  }
+}
+
+
+$('#file-all-styles').onclick = () => {
+  getStylesSafe().then(styles => {
+    const text = JSON.stringify(styles, null, '\t');
+    const url = 'data:text/plain;charset=utf-8,' + encodeURIComponent(text);
+    return url;
+    // for long URLs; https://github.com/schomery/stylus/issues/13#issuecomment-284582600
+  }).then(fetch)
+    .then(res => res.blob())
+    .then(blob => {
+      const objectURL = URL.createObjectURL(blob);
+      let link = $element({
+        tag:'a',
+        href: objectURL,
+        type: 'application/json',
+        download: generateFileName(),
+      });
+      // TODO: remove the fallback when FF multi-process bug is fixed
+      if (!FIREFOX) {
+        link.dispatchEvent(new MouseEvent('click'));
+        setTimeout(() => URL.revokeObjectURL(objectURL));
+      } else {
+        const iframe = document.body.appendChild($element({
+          tag: 'iframe',
+          style: 'width: 0; height: 0; position: fixed; opacity: 0;'.replace(/;/g, '!important;'),
+        }));
+        doTimeout().then(() => {
+          link = iframe.contentDocument.importNode(link, true);
+          iframe.contentDocument.body.appendChild(link);
+        })
+        .then(doTimeout)
+        .then(() => link.dispatchEvent(new MouseEvent('click')))
+        .then(doTimeout(1000))
+        .then(() => {
+          URL.revokeObjectURL(objectURL);
+          iframe.remove();
+        });
+      }
+    });
+
+  function generateFileName() {
+    const today = new Date();
+    const dd = ('0' + today.getDate()).substr(-2);
+    const mm = ('0' + (today.getMonth() + 1)).substr(-2);
+    const yyyy = today.getFullYear();
+    return `stylus-${yyyy}-${mm}-${dd}${STYLUS_BACKUP_FILE_EXT}`;
+  }
+};
+
+
+$('#unfile-all-styles').onclick = () => {
+  importFromFile({fileTypeFilter: STYLUS_BACKUP_FILE_EXT});
+};
+
+Object.assign(document.body, {
+  ondragover(event) {
+    const hasFiles = event.dataTransfer.types.includes('Files');
+    event.dataTransfer.dropEffect = hasFiles || event.target.type == 'search' ? 'copy' : 'none';
+    this.classList.toggle('dropzone', hasFiles);
+    if (hasFiles) {
+      event.preventDefault();
+      clearTimeout(this.fadeoutTimer);
+      this.classList.remove('fadeout');
+    }
+  },
+  ondragend(event) {
+    animateElement(this, {className: 'fadeout', removeExtraClasses: ['dropzone']}).then(() => {
+      this.style.animationDuration = '';
+    });
+  },
+  ondragleave(event) {
+    try {
+      // in Firefox event.target could be XUL browser and hence there is no permission to access it
+      if (event.target === this) {
+        this.ondragend();
+      }
+    } catch (e) {
+      this.ondragend();
+    }
+  },
+  ondrop(event) {
+    this.ondragend();
+    if (event.dataTransfer.files.length) {
+      event.preventDefault();
+      if ($('#onlyUpdates input').checked) {
+        $('#onlyUpdates input').click();
+      }
+      importFromFile({file: event.dataTransfer.files[0]});
+    }
+  },
+});
+=======
+/* global messageBox, handleUpdate, applyOnMessage */
+'use strict';
+
+const STYLISH_DUMP_FILE_EXT = '.txt';
+const STYLUS_BACKUP_FILE_EXT = '.json';
+
+
+function importFromFile({fileTypeFilter, file} = {}) {
+  return new Promise(resolve => {
+    const fileInput = document.createElement('input');
+    if (file) {
+      readFile();
+      return;
+    }
+    fileInput.style.display = 'none';
+    fileInput.type = 'file';
+    fileInput.accept = fileTypeFilter || STYLISH_DUMP_FILE_EXT;
+    fileInput.acceptCharset = 'utf-8';
+
+    document.body.appendChild(fileInput);
+    fileInput.initialValue = fileInput.value;
+    fileInput.onchange = readFile;
+    fileInput.click();
+
+    function readFile() {
+      if (file || fileInput.value !== fileInput.initialValue) {
+        file = file || fileInput.files[0];
+        if (file.size > 100e6) {
+          console.warn("100MB backup? I don't believe you.");
+          importFromString('').then(resolve);
+          return;
+        }
+        document.body.style.cursor = 'wait';
+        const fReader = new FileReader();
+        fReader.onloadend = event => {
+          fileInput.remove();
+          importFromString(event.target.result).then(numStyles => {
+            document.body.style.cursor = '';
+            resolve(numStyles);
+          });
+        };
+        fReader.readAsText(file, 'utf-8');
+      }
+    }
+  });
+}
+
+
+function importFromString(jsonString) {
+  if (!BG) {
+    onBackgroundReady().then(() => importFromString(jsonString));
+    return;
+  }
+  // create objects in background context
+  const json = BG.tryJSONparse(jsonString) || [];
+  if (typeof json.slice != 'function') {
+    json.length = 0;
+  }
+  const oldStyles = json.length && BG.deepCopy(BG.cachedStyles.list || []);
+  const oldStylesByName = json.length && new Map(
+    oldStyles.map(style => [style.name.trim(), style]));
+
+  const stats = {
+    added:       {names: [], ids: [], legend: 'importReportLegendAdded'},
+    unchanged:   {names: [], ids: [], legend: 'importReportLegendIdentical'},
+    metaAndCode: {names: [], ids: [], legend: 'importReportLegendUpdatedBoth'},
+    metaOnly:    {names: [], ids: [], legend: 'importReportLegendUpdatedMeta'},
+    codeOnly:    {names: [], ids: [], legend: 'importReportLegendUpdatedCode'},
+    invalid:     {names: [], legend: 'importReportLegendInvalid'},
+  };
+
+  let index = 0;
+  let lastRenderTime = performance.now();
+  const renderQueue = [];
+  const RENDER_NAP_TIME_MAX = 1000; // ms
+  const RENDER_QUEUE_MAX = 50; // number of styles
+  const SAVE_OPTIONS = {reason: 'import', notify: false};
+
+  return new Promise(proceed);
+
+  function proceed(resolve) {
+    while (index < json.length) {
+      const item = json[index++];
+      const info = analyze(item);
+      if (info) {
+        // using saveStyle directly since json was parsed in background page context
+        return BG.saveStyle(Object.assign(item, SAVE_OPTIONS))
+          .then(style => account({style, info, resolve}));
+      }
+    }
+    renderQueue.forEach(style => handleUpdate(style, {reason: 'import'}));
+    renderQueue.length = 0;
+    done(resolve);
+  }
+
+  function analyze(item) {
+    if (!item || !item.name || !item.name.trim() || typeof item != 'object'
+    || (item.sections && typeof item.sections.slice != 'function')) {
+      stats.invalid.names.push(`#${index}: ${limitString(item && item.name || '')}`);
+      return;
+    }
+    item.name = item.name.trim();
+    const byId = BG.cachedStyles.byId.get(item.id);
+    const byName = oldStylesByName.get(item.name);
+    oldStylesByName.delete(item.name);
+    let oldStyle;
+    if (byId) {
+      if (sameStyle(byId, item)) {
+        oldStyle = byId;
+      } else {
+        item.id = null;
+      }
+    }
+    if (!oldStyle && byName) {
+      item.id = byName.id;
+      oldStyle = byName;
+    }
+    const oldStyleKeys = oldStyle && Object.keys(oldStyle);
+    const metaEqual = oldStyleKeys &&
+      oldStyleKeys.length == Object.keys(item).length &&
+      oldStyleKeys.every(k => k == 'sections' || oldStyle[k] === item[k]);
+    const codeEqual = oldStyle && BG.styleSectionsEqual(oldStyle, item);
+    if (metaEqual && codeEqual) {
+      stats.unchanged.names.push(oldStyle.name);
+      stats.unchanged.ids.push(oldStyle.id);
+      return;
+    }
+    return {oldStyle, metaEqual, codeEqual};
+  }
+
+  function sameStyle(oldStyle, newStyle) {
+    return oldStyle.name.trim() === newStyle.name.trim() ||
+      ['updateUrl', 'originalMd5', 'originalDigest']
+        .some(field => oldStyle[field] && oldStyle[field] == newStyle[field]);
+  }
+
+  function account({style, info, resolve}) {
+    renderQueue.push(style);
+    if (performance.now() - lastRenderTime > RENDER_NAP_TIME_MAX
+    || renderQueue.length > RENDER_QUEUE_MAX) {
+      renderQueue.forEach(style => handleUpdate(style, {reason: 'import'}));
+      setTimeout(scrollElementIntoView, 0, $('#style-' + renderQueue.pop().id));
+      renderQueue.length = 0;
+      lastRenderTime = performance.now();
+    }
+    setTimeout(proceed, 0, resolve);
+    const {oldStyle, metaEqual, codeEqual} = info;
+    if (!oldStyle) {
+      stats.added.names.push(style.name);
+      stats.added.ids.push(style.id);
+      return;
+    }
+    if (!metaEqual && !codeEqual) {
+      stats.metaAndCode.names.push(reportNameChange(oldStyle, style));
+      stats.metaAndCode.ids.push(style.id);
+      return;
+    }
+    if (!codeEqual) {
+      stats.codeOnly.names.push(style.name);
+      stats.codeOnly.ids.push(style.id);
+      return;
+    }
+    stats.metaOnly.names.push(reportNameChange(oldStyle, style));
+    stats.metaOnly.ids.push(style.id);
+  }
+
+  function done(resolve) {
+    const numChanged = stats.metaAndCode.names.length +
+      stats.metaOnly.names.length +
+      stats.codeOnly.names.length +
+      stats.added.names.length;
+    Promise.resolve(numChanged && refreshAllTabs()).then(() => {
+      const report = Object.keys(stats)
+        .filter(kind => stats[kind].names.length)
+        .map(kind => {
+          const {ids, names, legend} = stats[kind];
+          const listItemsWithId = (name, i) =>
+            $element({dataset: {id: ids[i]}, textContent: name});
+          const listItems = name =>
+            $element({textContent: name});
+          const block =
+            $element({tag: 'details', dataset: {id: kind}, appendChild: [
+              $element({tag: 'summary', appendChild:
+                $element({tag: 'b', textContent: names.length + ' ' + t(legend)})
+              }),
+              $element({tag: 'small', appendChild:
+                names.map(ids ? listItemsWithId : listItems)
+              }),
+            ]});
+          return block;
+        });
+      scrollTo(0, 0);
+      messageBox({
+        title: t('importReportTitle'),
+        contents: report.length ? report : t('importReportUnchanged'),
+        buttons: [t('confirmOK'), numChanged && t('undo')],
+        onshow:  bindClick,
+      }).then(({button, enter, esc}) => {
+        if (button == 1) {
+          undo();
+        }
+      });
+      resolve(numChanged);
+    });
+  }
+
+  function undo() {
+    const oldStylesById = new Map(oldStyles.map(style => [style.id, style]));
+    const newIds = [
+      ...stats.metaAndCode.ids,
+      ...stats.metaOnly.ids,
+      ...stats.codeOnly.ids,
+      ...stats.added.ids,
+    ];
+    let resolve;
+    index = 0;
+    return new Promise(resolve_ => {
+      resolve = resolve_;
+      undoNextId();
+    }).then(refreshAllTabs)
+      .then(() => messageBox({
+        title: t('importReportUndoneTitle'),
+        contents: newIds.length + ' ' + t('importReportUndone'),
+        buttons: [t('confirmOK')],
+      }));
+    function undoNextId() {
+      if (index == newIds.length) {
+        resolve();
+        return;
+      }
+      const id = newIds[index++];
+      deleteStyleSafe({id, notify: false}).then(id => {
+        const oldStyle = oldStylesById.get(id);
+        if (oldStyle) {
+          saveStyleSafe(Object.assign(oldStyle, SAVE_OPTIONS))
+            .then(undoNextId);
+        } else {
+          undoNextId();
+        }
+      });
+    }
+  }
+
+  function bindClick(box) {
+    const highlightElement = event => {
+      const styleElement = $('#style-' + event.target.dataset.id);
+      if (styleElement) {
+        scrollElementIntoView(styleElement);
+        animateElement(styleElement);
+      }
+    };
+    for (const block of $$('details')) {
+      if (block.dataset.id != 'invalid') {
+        block.style.cursor = 'pointer';
+        block.onclick = highlightElement;
+      }
+    }
+  }
+
+  function limitString(s, limit = 100) {
+    return s.length <= limit ? s : s.substr(0, limit) + '...';
+  }
+
+  function reportNameChange(oldStyle, newStyle) {
+    return newStyle.name != oldStyle.name
+      ? oldStyle.name + ' —> ' + newStyle.name
+      : oldStyle.name;
+  }
+
+  function refreshAllTabs() {
+    return Promise.all([
+      getActiveTab(),
+      getOwnTab(),
+    ]).then(([activeTab, ownTab]) => new Promise(resolve => {
+      // list all tabs including chrome-extension:// which can be ours
+      queryTabs().then(tabs => {
+        const lastTab = tabs[tabs.length - 1];
+        for (const tab of tabs) {
+          // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
+          if (FIREFOX && !tab.width) {
+            if (tab == lastTab) {
+              resolve();
+            }
+            continue;
+          }
+          getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
+            const message = {method: 'styleReplaceAll', styles};
+            if (tab.id == ownTab.id) {
+              applyOnMessage(message);
+            } else {
+              invokeOrPostpone(tab.id == activeTab.id,
+                chrome.tabs.sendMessage, tab.id, message, ignoreChromeError);
+            }
+            setTimeout(BG.updateIcon, 0, tab, styles);
+            if (tab == lastTab) {
+              resolve();
+            }
+          });
+        }
+      });
+    }));
+  }
+}
+
+
+$('#file-all-styles').onclick = () => {
+  getStylesSafe().then(styles => {
+    const text = JSON.stringify(styles, null, '\t');
+    const url = 'data:text/plain;charset=utf-8,' + encodeURIComponent(text);
+    return url;
+    // for long URLs; https://github.com/schomery/stylus/issues/13#issuecomment-284582600
+  }).then(fetch)
+    .then(res => res.blob())
+    .then(blob => {
+      const objectURL = URL.createObjectURL(blob);
+      let link = $element({
+        tag:'a',
+        href: objectURL,
+        type: 'application/json',
+        download: generateFileName(),
+      });
+      // TODO: remove the fallback when FF multi-process bug is fixed
+      if (!FIREFOX) {
+        link.dispatchEvent(new MouseEvent('click'));
+        setTimeout(() => URL.revokeObjectURL(objectURL));
+      } else {
+        const iframe = document.body.appendChild($element({
+          tag: 'iframe',
+          style: 'width: 0; height: 0; position: fixed; opacity: 0;'.replace(/;/g, '!important;'),
+        }));
+        doTimeout().then(() => {
+          link = iframe.contentDocument.importNode(link, true);
+          iframe.contentDocument.body.appendChild(link);
+        })
+        .then(doTimeout)
+        .then(() => link.dispatchEvent(new MouseEvent('click')))
+        .then(doTimeout(1000))
+        .then(() => {
+          URL.revokeObjectURL(objectURL);
+          iframe.remove();
+        });
+      }
+    });
+
+  function generateFileName() {
+    const today = new Date();
+    const dd = ('0' + today.getDate()).substr(-2);
+    const mm = ('0' + (today.getMonth() + 1)).substr(-2);
+    const yyyy = today.getFullYear();
+    return `stylus-${mm}-${dd}-${yyyy}${STYLUS_BACKUP_FILE_EXT}`;
+  }
+};
+
+
+$('#unfile-all-styles').onclick = () => {
+  importFromFile({fileTypeFilter: STYLUS_BACKUP_FILE_EXT});
+};
+
+Object.assign(document.body, {
+  ondragover(event) {
+    const hasFiles = event.dataTransfer.types.includes('Files');
+    event.dataTransfer.dropEffect = hasFiles || event.target.type == 'search' ? 'copy' : 'none';
+    this.classList.toggle('dropzone', hasFiles);
+    if (hasFiles) {
+      event.preventDefault();
+      clearTimeout(this.fadeoutTimer);
+      this.classList.remove('fadeout');
+    }
+  },
+  ondragend(event) {
+    animateElement(this, {className: 'fadeout', removeExtraClasses: ['dropzone']}).then(() => {
+      this.style.animationDuration = '';
+    });
+  },
+  ondragleave(event) {
+    try {
+      // in Firefox event.target could be XUL browser and hence there is no permission to access it
+      if (event.target === this) {
+        this.ondragend();
+      }
+    } catch (e) {
+      this.ondragend();
+    }
+  },
+  ondrop(event) {
+    this.ondragend();
+    if (event.dataTransfer.files.length) {
+      event.preventDefault();
+      if ($('#onlyUpdates input').checked) {
+        $('#onlyUpdates input').click();
+      }
+      importFromFile({file: event.dataTransfer.files[0]});
+    }
+  },
+});
diff --git a/manage.css b/manage/manage.css
similarity index 100%
rename from manage.css
rename to manage/manage.css
diff --git a/manage.js b/manage/manage.js
similarity index 100%
rename from manage.js
rename to manage/manage.js
diff --git a/popup.css b/popup/popup.css
similarity index 100%
rename from popup.css
rename to popup/popup.css
diff --git a/popup.js b/popup/popup.js
similarity index 100%
rename from popup.js
rename to popup/popup.js
diff --git a/pull_locales.rb b/tools/pull_locales.rb
similarity index 100%
rename from pull_locales.rb
rename to tools/pull_locales.rb
diff --git a/pull_locales.sh b/tools/pull_locales.sh
old mode 100755
new mode 100644
similarity index 100%
rename from pull_locales.sh
rename to tools/pull_locales.sh
diff --git a/pull_locales_postprocess.py b/tools/pull_locales_postprocess.py
similarity index 100%
rename from pull_locales_postprocess.py
rename to tools/pull_locales_postprocess.py
diff --git a/beautify/beautify-css-mod.js b/vendor-overwrites/beautify/beautify-css-mod.js
similarity index 100%
rename from beautify/beautify-css-mod.js
rename to vendor-overwrites/beautify/beautify-css-mod.js
diff --git a/beautify/beautify-css.js b/vendor-overwrites/beautify/beautify-css.js
similarity index 100%
rename from beautify/beautify-css.js
rename to vendor-overwrites/beautify/beautify-css.js
diff --git a/codemirror-overwrites/addon/lint/css-lint.js b/vendor-overwrites/codemirror/addon/lint/css-lint.js
similarity index 100%
rename from codemirror-overwrites/addon/lint/css-lint.js
rename to vendor-overwrites/codemirror/addon/lint/css-lint.js
diff --git a/codemirror-overwrites/addon/search/match-highlighter.js b/vendor-overwrites/codemirror/addon/search/match-highlighter.js
similarity index 100%
rename from codemirror-overwrites/addon/search/match-highlighter.js
rename to vendor-overwrites/codemirror/addon/search/match-highlighter.js
diff --git a/codemirror/LICENSE b/vendor/codemirror/LICENSE
similarity index 100%
rename from codemirror/LICENSE
rename to vendor/codemirror/LICENSE
diff --git a/codemirror/addon/comment/comment.js b/vendor/codemirror/addon/comment/comment.js
similarity index 100%
rename from codemirror/addon/comment/comment.js
rename to vendor/codemirror/addon/comment/comment.js
diff --git a/codemirror/addon/dialog/dialog.css b/vendor/codemirror/addon/dialog/dialog.css
similarity index 100%
rename from codemirror/addon/dialog/dialog.css
rename to vendor/codemirror/addon/dialog/dialog.css
diff --git a/codemirror/addon/dialog/dialog.js b/vendor/codemirror/addon/dialog/dialog.js
similarity index 100%
rename from codemirror/addon/dialog/dialog.js
rename to vendor/codemirror/addon/dialog/dialog.js
diff --git a/codemirror/addon/edit/matchbrackets.js b/vendor/codemirror/addon/edit/matchbrackets.js
similarity index 100%
rename from codemirror/addon/edit/matchbrackets.js
rename to vendor/codemirror/addon/edit/matchbrackets.js
diff --git a/codemirror/addon/fold/brace-fold.js b/vendor/codemirror/addon/fold/brace-fold.js
similarity index 100%
rename from codemirror/addon/fold/brace-fold.js
rename to vendor/codemirror/addon/fold/brace-fold.js
diff --git a/codemirror/addon/fold/comment-fold.js b/vendor/codemirror/addon/fold/comment-fold.js
similarity index 100%
rename from codemirror/addon/fold/comment-fold.js
rename to vendor/codemirror/addon/fold/comment-fold.js
diff --git a/codemirror/addon/fold/foldcode.js b/vendor/codemirror/addon/fold/foldcode.js
similarity index 100%
rename from codemirror/addon/fold/foldcode.js
rename to vendor/codemirror/addon/fold/foldcode.js
diff --git a/codemirror/addon/fold/foldgutter.css b/vendor/codemirror/addon/fold/foldgutter.css
similarity index 100%
rename from codemirror/addon/fold/foldgutter.css
rename to vendor/codemirror/addon/fold/foldgutter.css
diff --git a/codemirror/addon/fold/foldgutter.js b/vendor/codemirror/addon/fold/foldgutter.js
similarity index 100%
rename from codemirror/addon/fold/foldgutter.js
rename to vendor/codemirror/addon/fold/foldgutter.js
diff --git a/codemirror/addon/hint/css-hint.js b/vendor/codemirror/addon/hint/css-hint.js
similarity index 100%
rename from codemirror/addon/hint/css-hint.js
rename to vendor/codemirror/addon/hint/css-hint.js
diff --git a/codemirror/addon/hint/show-hint.css b/vendor/codemirror/addon/hint/show-hint.css
similarity index 100%
rename from codemirror/addon/hint/show-hint.css
rename to vendor/codemirror/addon/hint/show-hint.css
diff --git a/codemirror/addon/hint/show-hint.js b/vendor/codemirror/addon/hint/show-hint.js
similarity index 100%
rename from codemirror/addon/hint/show-hint.js
rename to vendor/codemirror/addon/hint/show-hint.js
diff --git a/codemirror/addon/lint/css-lint.js b/vendor/codemirror/addon/lint/css-lint.js
similarity index 100%
rename from codemirror/addon/lint/css-lint.js
rename to vendor/codemirror/addon/lint/css-lint.js
diff --git a/codemirror/addon/lint/lint.css b/vendor/codemirror/addon/lint/lint.css
similarity index 100%
rename from codemirror/addon/lint/lint.css
rename to vendor/codemirror/addon/lint/lint.css
diff --git a/codemirror/addon/lint/lint.js b/vendor/codemirror/addon/lint/lint.js
similarity index 100%
rename from codemirror/addon/lint/lint.js
rename to vendor/codemirror/addon/lint/lint.js
diff --git a/codemirror/addon/scroll/annotatescrollbar.js b/vendor/codemirror/addon/scroll/annotatescrollbar.js
similarity index 100%
rename from codemirror/addon/scroll/annotatescrollbar.js
rename to vendor/codemirror/addon/scroll/annotatescrollbar.js
diff --git a/codemirror/addon/search/matchesonscrollbar.css b/vendor/codemirror/addon/search/matchesonscrollbar.css
similarity index 100%
rename from codemirror/addon/search/matchesonscrollbar.css
rename to vendor/codemirror/addon/search/matchesonscrollbar.css
diff --git a/codemirror/addon/search/matchesonscrollbar.js b/vendor/codemirror/addon/search/matchesonscrollbar.js
similarity index 100%
rename from codemirror/addon/search/matchesonscrollbar.js
rename to vendor/codemirror/addon/search/matchesonscrollbar.js
diff --git a/codemirror/addon/search/search.js b/vendor/codemirror/addon/search/search.js
similarity index 100%
rename from codemirror/addon/search/search.js
rename to vendor/codemirror/addon/search/search.js
diff --git a/codemirror/addon/search/searchcursor.js b/vendor/codemirror/addon/search/searchcursor.js
similarity index 100%
rename from codemirror/addon/search/searchcursor.js
rename to vendor/codemirror/addon/search/searchcursor.js
diff --git a/codemirror/addon/selection/active-line.js b/vendor/codemirror/addon/selection/active-line.js
similarity index 100%
rename from codemirror/addon/selection/active-line.js
rename to vendor/codemirror/addon/selection/active-line.js
diff --git a/codemirror/keymap/emacs.js b/vendor/codemirror/keymap/emacs.js
similarity index 100%
rename from codemirror/keymap/emacs.js
rename to vendor/codemirror/keymap/emacs.js
diff --git a/codemirror/keymap/sublime.js b/vendor/codemirror/keymap/sublime.js
similarity index 100%
rename from codemirror/keymap/sublime.js
rename to vendor/codemirror/keymap/sublime.js
diff --git a/codemirror/keymap/vim.js b/vendor/codemirror/keymap/vim.js
similarity index 100%
rename from codemirror/keymap/vim.js
rename to vendor/codemirror/keymap/vim.js
diff --git a/codemirror/lib/codemirror.css b/vendor/codemirror/lib/codemirror.css
similarity index 100%
rename from codemirror/lib/codemirror.css
rename to vendor/codemirror/lib/codemirror.css
diff --git a/codemirror/lib/codemirror.js b/vendor/codemirror/lib/codemirror.js
similarity index 100%
rename from codemirror/lib/codemirror.js
rename to vendor/codemirror/lib/codemirror.js
diff --git a/codemirror/mode/css/css.js b/vendor/codemirror/mode/css/css.js
similarity index 100%
rename from codemirror/mode/css/css.js
rename to vendor/codemirror/mode/css/css.js
diff --git a/codemirror/mode/css/gss.html b/vendor/codemirror/mode/css/gss.html
similarity index 100%
rename from codemirror/mode/css/gss.html
rename to vendor/codemirror/mode/css/gss.html
diff --git a/codemirror/mode/css/gss_test.js b/vendor/codemirror/mode/css/gss_test.js
similarity index 100%
rename from codemirror/mode/css/gss_test.js
rename to vendor/codemirror/mode/css/gss_test.js
diff --git a/codemirror/mode/css/index.html b/vendor/codemirror/mode/css/index.html
similarity index 100%
rename from codemirror/mode/css/index.html
rename to vendor/codemirror/mode/css/index.html
diff --git a/codemirror/mode/css/less.html b/vendor/codemirror/mode/css/less.html
similarity index 100%
rename from codemirror/mode/css/less.html
rename to vendor/codemirror/mode/css/less.html
diff --git a/codemirror/mode/css/less_test.js b/vendor/codemirror/mode/css/less_test.js
similarity index 100%
rename from codemirror/mode/css/less_test.js
rename to vendor/codemirror/mode/css/less_test.js
diff --git a/codemirror/mode/css/scss.html b/vendor/codemirror/mode/css/scss.html
similarity index 100%
rename from codemirror/mode/css/scss.html
rename to vendor/codemirror/mode/css/scss.html
diff --git a/codemirror/mode/css/scss_test.js b/vendor/codemirror/mode/css/scss_test.js
similarity index 100%
rename from codemirror/mode/css/scss_test.js
rename to vendor/codemirror/mode/css/scss_test.js
diff --git a/codemirror/mode/css/test.js b/vendor/codemirror/mode/css/test.js
similarity index 100%
rename from codemirror/mode/css/test.js
rename to vendor/codemirror/mode/css/test.js
diff --git a/codemirror/theme/3024-day.css b/vendor/codemirror/theme/3024-day.css
similarity index 100%
rename from codemirror/theme/3024-day.css
rename to vendor/codemirror/theme/3024-day.css
diff --git a/codemirror/theme/3024-night.css b/vendor/codemirror/theme/3024-night.css
similarity index 100%
rename from codemirror/theme/3024-night.css
rename to vendor/codemirror/theme/3024-night.css
diff --git a/codemirror/theme/abcdef.css b/vendor/codemirror/theme/abcdef.css
similarity index 100%
rename from codemirror/theme/abcdef.css
rename to vendor/codemirror/theme/abcdef.css
diff --git a/codemirror/theme/ambiance-mobile.css b/vendor/codemirror/theme/ambiance-mobile.css
similarity index 100%
rename from codemirror/theme/ambiance-mobile.css
rename to vendor/codemirror/theme/ambiance-mobile.css
diff --git a/codemirror/theme/ambiance.css b/vendor/codemirror/theme/ambiance.css
similarity index 100%
rename from codemirror/theme/ambiance.css
rename to vendor/codemirror/theme/ambiance.css
diff --git a/codemirror/theme/base16-dark.css b/vendor/codemirror/theme/base16-dark.css
similarity index 100%
rename from codemirror/theme/base16-dark.css
rename to vendor/codemirror/theme/base16-dark.css
diff --git a/codemirror/theme/base16-light.css b/vendor/codemirror/theme/base16-light.css
similarity index 100%
rename from codemirror/theme/base16-light.css
rename to vendor/codemirror/theme/base16-light.css
diff --git a/codemirror/theme/bespin.css b/vendor/codemirror/theme/bespin.css
similarity index 100%
rename from codemirror/theme/bespin.css
rename to vendor/codemirror/theme/bespin.css
diff --git a/codemirror/theme/blackboard.css b/vendor/codemirror/theme/blackboard.css
similarity index 100%
rename from codemirror/theme/blackboard.css
rename to vendor/codemirror/theme/blackboard.css
diff --git a/codemirror/theme/cobalt.css b/vendor/codemirror/theme/cobalt.css
similarity index 100%
rename from codemirror/theme/cobalt.css
rename to vendor/codemirror/theme/cobalt.css
diff --git a/codemirror/theme/colorforth.css b/vendor/codemirror/theme/colorforth.css
similarity index 100%
rename from codemirror/theme/colorforth.css
rename to vendor/codemirror/theme/colorforth.css
diff --git a/codemirror/theme/dracula.css b/vendor/codemirror/theme/dracula.css
similarity index 100%
rename from codemirror/theme/dracula.css
rename to vendor/codemirror/theme/dracula.css
diff --git a/codemirror/theme/duotone-dark.css b/vendor/codemirror/theme/duotone-dark.css
similarity index 100%
rename from codemirror/theme/duotone-dark.css
rename to vendor/codemirror/theme/duotone-dark.css
diff --git a/codemirror/theme/duotone-light.css b/vendor/codemirror/theme/duotone-light.css
similarity index 100%
rename from codemirror/theme/duotone-light.css
rename to vendor/codemirror/theme/duotone-light.css
diff --git a/codemirror/theme/eclipse.css b/vendor/codemirror/theme/eclipse.css
similarity index 100%
rename from codemirror/theme/eclipse.css
rename to vendor/codemirror/theme/eclipse.css
diff --git a/codemirror/theme/elegant.css b/vendor/codemirror/theme/elegant.css
similarity index 100%
rename from codemirror/theme/elegant.css
rename to vendor/codemirror/theme/elegant.css
diff --git a/codemirror/theme/erlang-dark.css b/vendor/codemirror/theme/erlang-dark.css
similarity index 100%
rename from codemirror/theme/erlang-dark.css
rename to vendor/codemirror/theme/erlang-dark.css
diff --git a/codemirror/theme/hopscotch.css b/vendor/codemirror/theme/hopscotch.css
similarity index 100%
rename from codemirror/theme/hopscotch.css
rename to vendor/codemirror/theme/hopscotch.css
diff --git a/codemirror/theme/icecoder.css b/vendor/codemirror/theme/icecoder.css
similarity index 100%
rename from codemirror/theme/icecoder.css
rename to vendor/codemirror/theme/icecoder.css
diff --git a/codemirror/theme/isotope.css b/vendor/codemirror/theme/isotope.css
similarity index 100%
rename from codemirror/theme/isotope.css
rename to vendor/codemirror/theme/isotope.css
diff --git a/codemirror/theme/lesser-dark.css b/vendor/codemirror/theme/lesser-dark.css
similarity index 100%
rename from codemirror/theme/lesser-dark.css
rename to vendor/codemirror/theme/lesser-dark.css
diff --git a/codemirror/theme/liquibyte.css b/vendor/codemirror/theme/liquibyte.css
similarity index 100%
rename from codemirror/theme/liquibyte.css
rename to vendor/codemirror/theme/liquibyte.css
diff --git a/codemirror/theme/material.css b/vendor/codemirror/theme/material.css
similarity index 100%
rename from codemirror/theme/material.css
rename to vendor/codemirror/theme/material.css
diff --git a/codemirror/theme/mbo.css b/vendor/codemirror/theme/mbo.css
similarity index 100%
rename from codemirror/theme/mbo.css
rename to vendor/codemirror/theme/mbo.css
diff --git a/codemirror/theme/mdn-like.css b/vendor/codemirror/theme/mdn-like.css
similarity index 100%
rename from codemirror/theme/mdn-like.css
rename to vendor/codemirror/theme/mdn-like.css
diff --git a/codemirror/theme/midnight.css b/vendor/codemirror/theme/midnight.css
similarity index 100%
rename from codemirror/theme/midnight.css
rename to vendor/codemirror/theme/midnight.css
diff --git a/codemirror/theme/monokai.css b/vendor/codemirror/theme/monokai.css
similarity index 100%
rename from codemirror/theme/monokai.css
rename to vendor/codemirror/theme/monokai.css
diff --git a/codemirror/theme/neat.css b/vendor/codemirror/theme/neat.css
similarity index 100%
rename from codemirror/theme/neat.css
rename to vendor/codemirror/theme/neat.css
diff --git a/codemirror/theme/neo.css b/vendor/codemirror/theme/neo.css
similarity index 100%
rename from codemirror/theme/neo.css
rename to vendor/codemirror/theme/neo.css
diff --git a/codemirror/theme/night.css b/vendor/codemirror/theme/night.css
similarity index 100%
rename from codemirror/theme/night.css
rename to vendor/codemirror/theme/night.css
diff --git a/codemirror/theme/panda-syntax.css b/vendor/codemirror/theme/panda-syntax.css
similarity index 100%
rename from codemirror/theme/panda-syntax.css
rename to vendor/codemirror/theme/panda-syntax.css
diff --git a/codemirror/theme/paraiso-dark.css b/vendor/codemirror/theme/paraiso-dark.css
similarity index 100%
rename from codemirror/theme/paraiso-dark.css
rename to vendor/codemirror/theme/paraiso-dark.css
diff --git a/codemirror/theme/paraiso-light.css b/vendor/codemirror/theme/paraiso-light.css
similarity index 100%
rename from codemirror/theme/paraiso-light.css
rename to vendor/codemirror/theme/paraiso-light.css
diff --git a/codemirror/theme/pastel-on-dark.css b/vendor/codemirror/theme/pastel-on-dark.css
similarity index 100%
rename from codemirror/theme/pastel-on-dark.css
rename to vendor/codemirror/theme/pastel-on-dark.css
diff --git a/codemirror/theme/railscasts.css b/vendor/codemirror/theme/railscasts.css
similarity index 100%
rename from codemirror/theme/railscasts.css
rename to vendor/codemirror/theme/railscasts.css
diff --git a/codemirror/theme/rubyblue.css b/vendor/codemirror/theme/rubyblue.css
similarity index 100%
rename from codemirror/theme/rubyblue.css
rename to vendor/codemirror/theme/rubyblue.css
diff --git a/codemirror/theme/seti.css b/vendor/codemirror/theme/seti.css
similarity index 100%
rename from codemirror/theme/seti.css
rename to vendor/codemirror/theme/seti.css
diff --git a/codemirror/theme/solarized.css b/vendor/codemirror/theme/solarized.css
similarity index 100%
rename from codemirror/theme/solarized.css
rename to vendor/codemirror/theme/solarized.css
diff --git a/codemirror/theme/the-matrix.css b/vendor/codemirror/theme/the-matrix.css
similarity index 100%
rename from codemirror/theme/the-matrix.css
rename to vendor/codemirror/theme/the-matrix.css
diff --git a/codemirror/theme/tomorrow-night-bright.css b/vendor/codemirror/theme/tomorrow-night-bright.css
similarity index 100%
rename from codemirror/theme/tomorrow-night-bright.css
rename to vendor/codemirror/theme/tomorrow-night-bright.css
diff --git a/codemirror/theme/tomorrow-night-eighties.css b/vendor/codemirror/theme/tomorrow-night-eighties.css
similarity index 100%
rename from codemirror/theme/tomorrow-night-eighties.css
rename to vendor/codemirror/theme/tomorrow-night-eighties.css
diff --git a/codemirror/theme/ttcn.css b/vendor/codemirror/theme/ttcn.css
similarity index 100%
rename from codemirror/theme/ttcn.css
rename to vendor/codemirror/theme/ttcn.css
diff --git a/codemirror/theme/twilight.css b/vendor/codemirror/theme/twilight.css
similarity index 100%
rename from codemirror/theme/twilight.css
rename to vendor/codemirror/theme/twilight.css
diff --git a/codemirror/theme/vibrant-ink.css b/vendor/codemirror/theme/vibrant-ink.css
similarity index 100%
rename from codemirror/theme/vibrant-ink.css
rename to vendor/codemirror/theme/vibrant-ink.css
diff --git a/codemirror/theme/xq-dark.css b/vendor/codemirror/theme/xq-dark.css
similarity index 100%
rename from codemirror/theme/xq-dark.css
rename to vendor/codemirror/theme/xq-dark.css
diff --git a/codemirror/theme/xq-light.css b/vendor/codemirror/theme/xq-light.css
similarity index 100%
rename from codemirror/theme/xq-light.css
rename to vendor/codemirror/theme/xq-light.css
diff --git a/codemirror/theme/yeti.css b/vendor/codemirror/theme/yeti.css
similarity index 100%
rename from codemirror/theme/yeti.css
rename to vendor/codemirror/theme/yeti.css
diff --git a/codemirror/theme/zenburn.css b/vendor/codemirror/theme/zenburn.css
similarity index 100%
rename from codemirror/theme/zenburn.css
rename to vendor/codemirror/theme/zenburn.css
diff --git a/csslint/WARNING.txt b/vendor/csslint/WARNING.txt
similarity index 100%
rename from csslint/WARNING.txt
rename to vendor/csslint/WARNING.txt
diff --git a/csslint/csslint-worker.js b/vendor/csslint/csslint-worker.js
similarity index 100%
rename from csslint/csslint-worker.js
rename to vendor/csslint/csslint-worker.js

From 57ff0b6cb730dedaa534196b775e7e5f772491c8 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Wed, 12 Jul 2017 13:45:50 -0500
Subject: [PATCH 73/94] Update eslint rule

---
 .eslintrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index a0e8a12e..c1fb1656 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -249,7 +249,7 @@ rules:
   sort-imports: [0]
   sort-keys: [0]
   space-before-blocks: [2, always]
-  space-before-function-paren: [2, never]
+  space-before-function-paren: [1, never]
   space-in-parens: [2, never]
   space-infix-ops: [2]
   space-unary-ops: [2]

From bb33ff3981be9f77a7621cd407b4ab5debc7dff2 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Wed, 12 Jul 2017 13:52:44 -0500
Subject: [PATCH 74/94] Fix links & split out edit.css

---
 background/background.js          |   2 +-
 edit.html                         | 977 ++++++------------------------
 edit/edit.css                     | 576 ++++++++++++++++++
 edit/edit.js                      |   8 +-
 index.html                        |  14 +-
 manage.html                       |  16 +-
 manifest.json                     |  14 +-
 options/index.js                  |   2 +-
 popup.html                        |  14 +-
 tools/pull_locales_postprocess.py |   4 +-
 10 files changed, 815 insertions(+), 812 deletions(-)
 create mode 100644 edit/edit.css

diff --git a/background/background.js b/background/background.js
index a2ae0627..fc5a7f30 100644
--- a/background/background.js
+++ b/background/background.js
@@ -98,7 +98,7 @@ updateIcon({id: undefined}, {});
 // browser commands
 browserCommands = {
   openManage() {
-    openURL({url: '/manage.html'});
+    openURL({url: 'manage.html'});
   },
   styleDisableAll(info) {
     prefs.set('disableAll', info ? info.checked : !prefs.get('disableAll'));
diff --git a/edit.html b/edit.html
index 2ec63cc2..fbb1ed9c 100644
--- a/edit.html
+++ b/edit.html
@@ -1,792 +1,213 @@
 <html id="stylus">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 
-		<script src="dom.js"></script>
-		<script src="messaging.js"></script>
-		<script src="prefs.js"></script>
-		<script src="localization.js"></script>
-		<script src="apply.js"></script>
-		<script src="edit.js"></script>
+    <script src="js/dom.js"></script>
+    <script src="background/messaging.js"></script>
+    <script src="js/prefs.js"></script>
+    <script src="js/localization.js"></script>
+    <script src="content/apply.js"></script>
+    <link rel="stylesheet" href="edit/edit.css">
+    <script src="edit/edit.js"></script>
 
-		<script src="codemirror/lib/codemirror.js"></script>
-		<link rel="stylesheet" href="codemirror/lib/codemirror.css">
-		<script src="codemirror/mode/css/css.js"></script>
+    <script src="vendor/codemirror/lib/codemirror.js"></script>
+    <link rel="stylesheet" href="vendor/codemirror/lib/codemirror.css">
+    <script src="vendor/codemirror/mode/css/css.js"></script>
 
-		<link rel="stylesheet" href="codemirror/addon/dialog/dialog.css">
-		<link rel="stylesheet" href="codemirror/addon/search/matchesonscrollbar.css">
-		<script src="codemirror/addon/scroll/annotatescrollbar.js"></script>
-		<script src="codemirror/addon/search/matchesonscrollbar.js"></script>
-		<script src="codemirror-overwrites/addon/search/match-highlighter.js"></script>
-		<script src="codemirror/addon/dialog/dialog.js"></script>
-		<script src="codemirror/addon/search/searchcursor.js"></script>
-		<script src="codemirror/addon/search/search.js"></script>
-		<script src="codemirror/addon/comment/comment.js"></script>
-		<script src="codemirror/addon/selection/active-line.js"></script>
+    <link rel="stylesheet" href="vendor/codemirror/addon/dialog/dialog.css">
+    <link rel="stylesheet" href="vendor/codemirror/addon/search/matchesonscrollbar.css">
+    <script src="vendor/codemirror/addon/scroll/annotatescrollbar.js"></script>
+    <script src="vendor/codemirror/addon/search/matchesonscrollbar.js"></script>
+    <script src="vendor-overwrites/codemirror/addon/search/match-highlighter.js"></script>
+    <script src="vendor/codemirror/addon/dialog/dialog.js"></script>
+    <script src="vendor/codemirror/addon/search/searchcursor.js"></script>
+    <script src="vendor/codemirror/addon/search/search.js"></script>
+    <script src="vendor/codemirror/addon/comment/comment.js"></script>
+    <script src="vendor/codemirror/addon/selection/active-line.js"></script>
 
-		<link rel="stylesheet" href="codemirror/addon/fold/foldgutter.css" />
-		<script src="codemirror/addon/fold/foldcode.js"></script>
-		<script src="codemirror/addon/fold/foldgutter.js"></script>
-		<script src="codemirror/addon/fold/brace-fold.js"></script>
-		<script src="codemirror/addon/fold/comment-fold.js"></script>
+    <link rel="stylesheet" href="vendor/codemirror/addon/fold/foldgutter.css" />
+    <script src="vendor/codemirror/addon/fold/foldcode.js"></script>
+    <script src="vendor/codemirror/addon/fold/foldgutter.js"></script>
+    <script src="vendor/codemirror/addon/fold/brace-fold.js"></script>
+    <script src="vendor/codemirror/addon/fold/comment-fold.js"></script>
 
-		<script src="codemirror/addon/edit/matchbrackets.js"></script>
+    <script src="vendor/codemirror/addon/edit/matchbrackets.js"></script>
 
-		<link rel="stylesheet" href="codemirror/addon/lint/lint.css" />
-		<script src="csslint/csslint-worker.js"></script>
-		<script src="codemirror/addon/lint/lint.js"></script>
-		<script src="codemirror-overwrites/addon/lint/css-lint.js"></script>
+    <link rel="stylesheet" href="vendor/codemirror/addon/lint/lint.css" />
+    <script src="vendor/csslint/csslint-worker.js"></script>
+    <script src="vendor/codemirror/addon/lint/lint.js"></script>
+    <script src="vendor-overwrites/codemirror/addon/lint/css-lint.js"></script>
 
-		<link rel="stylesheet" href="codemirror/addon/hint/show-hint.css" />
-		<script src="codemirror/addon/hint/show-hint.js"></script>
-		<script src="codemirror/addon/hint/css-hint.js"></script>
+    <link rel="stylesheet" href="vendor/codemirror/addon/hint/show-hint.css" />
+    <script src="vendor/codemirror/addon/hint/show-hint.js"></script>
+    <script src="vendor/codemirror/addon/hint/css-hint.js"></script>
 
-		<script src="codemirror/keymap/sublime.js"></script>
-		<script src="codemirror/keymap/emacs.js"></script>
-		<script src="codemirror/keymap/vim.js"></script>
+    <script src="vendor/codemirror/keymap/sublime.js"></script>
+    <script src="vendor/codemirror/keymap/emacs.js"></script>
+    <script src="vendor/codemirror/keymap/vim.js"></script>
+    <link id="cm-theme" rel="stylesheet">
 
-		<style type="text/css">
+    <template data-id="appliesTo">
+      <li>
+        <select name="applies-type" class="applies-type style-contributor">
+          <option value="url" i18n-text="appliesUrlOption"></option>
+          <option value="url-prefix" i18n-text="appliesUrlPrefixOption"></option>
+          <option value="domain" i18n-text="appliesDomainOption"></option>
+          <option value="regexp" i18n-text="appliesRegexpOption"></option>
+        </select>
+        <input name="applies-value" class="applies-value style-contributor">
+        <button class="remove-applies-to" i18n-text="appliesRemove"></button>
+        <button class="add-applies-to" i18n-text="appliesAdd"></button>
+      </li>
+    </template>
+    <template data-id="appliesToEverything">
+      <li class="applies-to-everything" i18n-html="appliesToEverything">
+        <button class="add-applies-to" i18n-text="appliesSpecify"></button>
+      </li>
+    </template>
+    <template data-id="section">
+      <div>
+        <label i18n-text="sectionCode"></label>
+        <textarea class="code"></textarea>
+        <br>
+        <div class="applies-to">
+          <label i18n-text="appliesLabel">
+            <svg class="svg-icon info applies-to-help"><use xlink:href="#svg-icon-help"/></svg>
+          </label>
+          <ul class="applies-to-list"></ul>
+        </div>
+        <button class="remove-section" i18n-text="sectionRemove"></button>
+        <button class="add-section" i18n-text="sectionAdd"></button>
+        <button class="beautify-section" i18n-text="styleBeautify"></button>
+        <button class="test-regexp" i18n-text="styleRegexpTestButton"></button>
+      </div>
+    </template>
+    <template data-id="find">
+      <span i18n-text="search">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
+        <span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
+      </span>
+    </template>
+    <template data-id="replace">
+      <span i18n-text="replace">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
+        <span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
+      </span>
+    </template>
+    <template data-id="replaceAll">
+      <span i18n-text="replaceAll">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
+        <span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
+      </span>
+    </template>
+    <template data-id="replaceWith">
+      <span i18n-text="replaceWith">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
+      </span>
+    </template>
+    <template data-id="replaceConfirm">
+      <span i18n-text="replace">?
+        <button i18n-text="confirmYes"></button>
+        <button i18n-text="confirmNo"></button>
+        <button i18n-text="confirmStop"></button>
+      </span>
+    </template>
+    <template data-id="jumpToLine">
+      <span i18n-text="editGotoLine">: <input class="CodeMirror-jump-field" type="text"></span>
+    </template>
+    <template data-id="regexpTestPartial">
+      <a target="_blank" href="https://github.com/stylish-userstyles/stylish/wiki/Applying-styles-to-specific-sites#advanced-matching-with-regular-expressions"><svg class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></a>
+    </template>
+    <template data-id="resizeGrip">
+      <div class="resize-grip" i18n-title="cm_resizeGripHint"></div>
+    </template>
+  </head>
 
-			body {
-				margin: 0;
-				font: 12px arial,sans-serif;
-			}
-			/************ header ************/
-			#header {
-				width: 280px;
-				height: 100vh;
-				overflow: auto;
-				position: fixed;
-				top: 0;
-				padding: 15px;
-				border-right: 1px dashed #AAA;
-				-webkit-box-shadow: 0 0 3rem -1.2rem black;
-				box-sizing: border-box;
-			}
-			#header h1 {
-				margin-top: 0;
-			}
-			#sections {
-				padding-left: 280px;
-			}
-			#sections h2 {
-				margin-top: 1rem;
-				margin-left: 1.7rem;
-			}
-			.aligned {
-				display: table-row;
-			}
-			.aligned > *:not(svg) {
-				display: table-cell;
-				margin-top: 0.1rem;
-				min-height: 1.4rem;
-			}
-			input[type="checkbox"] {
-				margin-left: 0.1rem;
-			}
-			/* basic info */
-			#basic-info {
-				margin-bottom: 1rem;
-			}
-			#name {
-				width: 100%;
-			}
-			#basic-info-name {
-				display: flex;
-				align-items: center;
-			}
-			#url {
-				margin-left: 0.25rem;
-			}
-			#url:not([href^="http"]) {
-				display: none;
-			}
-			#save-button {
-				opacity: .5;
-				pointer-events: none;
-			}
-			.dirty #save-button {
-				opacity: 1;
-				pointer-events: all;
-			}
-			.svg-icon {
-				cursor: pointer;
-				vertical-align: middle;
-				transition: fill .5s;
-				width: 16px;
-				height: 16px;
-			}
-			.svg-icon:not(.dismiss) {
-				margin-left: 0.2rem;
-			}
-			h2 .svg-icon, label .svg-icon {
-				margin-top: -1px;
-			}
-			.svg-icon.info {
-				width: 14px;
-				height: 16px;
-			}
-			.svg-icon:hover,
-			.svg-icon.info {
-				fill: #666;
-			}
-			.svg-icon,
-			.svg-icon.info:hover {
-				fill: #000;
-			}
-			#enabled {
-				margin-left: 0;
-				vertical-align: middle;
-			}
-			#enabled-label {
-				vertical-align: middle;
-			}
-			/* actions */
-			#actions > * {
-				margin-right: 0.5rem;
-				margin-bottom: 0.5rem;
-			}
-			/* options */
-			#options [type="number"] {
-				max-width: 2.5rem;
-				text-align: right;
-			}
-			#options .option > * {
-				padding-right: 0.25rem;
-			}
-			/************ content ***********/
-			#sections > div {
-				margin: 0.7rem;
-				padding: 1rem;
-			}
-			#sections > div:not(:first-of-type) {
-				border-top: 2px solid black;
-			}
-			#sections > div:only-of-type .remove-section {
-				display: none;
-			}
-			#sections > div > button:not(:first-of-type) {
-				margin-left: 0.2rem;
-			}
-			.dirty > label::before {
-				content: "*";
-				font-weight: bold;
-			}
-			#sections {
-				counter-reset: codebox;
-			}
-			#sections > div > label::after {
-				counter-increment: codebox;
-				content: counter(codebox);
-				margin-left: 0.25rem;
-			}
-			/* code */
-			.CodeMirror-hint:hover {
-				color: white;
-				background: #08f;
-			}
-			.code {
-				height: 10rem;
-				width: 40rem;
-			}
-			.CodeMirror {
-				border: solid #CCC 1px;
-			}
-			.CodeMirror-scroll {
-				height: auto;
-				position: absolute;
-				top: 0;
-				left: 0;
-				right: 0;
-				bottom: 6px; /* resize-grip height */
-			}
-			.CodeMirror-lint-mark-warning {
-				background: none;
-			}
-			.CodeMirror-vscrollbar {
-				margin-bottom: 7px; /* make space for resize-grip */
-			}
-			.CodeMirror-hscrollbar {
-		  		bottom: 7px; /* make space for resize-grip */
-			}
-			.CodeMirror-scrollbar-filler {
-				bottom: 7px; /* make space for resize-grip */
-			}
-			.CodeMirror-dialog {
-				-webkit-animation: highlight 3s ease-out;
-			}
-			.CodeMirror-focused {
-				outline: -webkit-focus-ring-color auto 5px;
-				outline-offset: -2px;
-			}
-			.CodeMirror-search-field {
-				width: 10em;
-			}
-			.CodeMirror-jump-field {
-				width: 5em;
-			}
-			.CodeMirror-search-hint {
-				color: #888;
-			}
-			body[data-match-highlight="token"] .cm-matchhighlight-approved .cm-matchhighlight,
-			body[data-match-highlight="token"] .CodeMirror-selection-highlight-scrollbar {
-				animation: fadein-match-highlighter 1s cubic-bezier(.97,.01,.42,.98);
-				animation-fill-mode: both;
-			}
-			body[data-match-highlight="selection"] .cm-matchhighlight-approved .cm-matchhighlight,
-			body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar {
-				background-color: rgba(1, 151, 193, 0.1);
-			}
-			@-webkit-keyframes highlight {
-				from {
-					background-color: #ff9;
-				}
-				to {
-					background-color: none;
-				}
-			}
-			@keyframes fadein {
-				from {
-					opacity: 0;
-				}
-				to {
-					opacity: 1;
-				}
-			}
-			@keyframes fadein-match-highlighter {
-				from { background-color: transparent; }
-				to   { background-color: rgba(1, 151, 193, 0.1); }
-			}
-			.resize-grip {
-				position: absolute;
-				display: block;
-				height: 6px;
-				content: "";
-				left: 0;
-				right: 0;
-				bottom: 0;
-				z-index: 9;
-				cursor: n-resize;
-				background-color: inherit;
-				border-top-width: 1px;
-				border-top-style: solid;
-				border-top-color: inherit;
-			}
-			.resize-grip:after {
-				content: "";
-				bottom: 2px;
-				left: 0;
-				right: 0;
-				margin: 0 8px;
-				display: block;
-				position: absolute;
-				border-top-width: 2px;
-				border-top-style: dotted;
-				border-top-color: inherit;
-			}
-			/* applies-to */
-			.applies-to {
-				display: flex;
-			}
-			.applies-to label {
-				flex: auto;
-				margin-top: 0.2rem;
-			}
-			.applies-to ul {
-				flex: auto;
-				flex-grow: 99;
-				margin: 0;
-				padding: 0;
-			}
-			.applies-to li {
-				display: flex;
-				list-style-type: none;
-				align-items: center;
-				margin-bottom: 0.35rem;
-			}
-			.applies-to li > *:not(button) {
-				flex: auto;
-				min-height: 1.4rem;
-				margin-left: 0.35rem;
-			}
-			.applies-to li .add-applies-to {
-				visibility: hidden;
-				text-align: left;
-			}
-			.applies-to li:last-child .add-applies-to {
-				visibility: visible
-			}
-			.applies-to li .add-applies-to:first-child {
-				margin-left: 1rem;
-			}
-			.applies-to li .applies-value {
-				flex-grow: 99;
-				padding-left: 0.2rem;
-			}
-			.applies-to img {
-				vertical-align: bottom;
-			}
-			.test-regexp {
-				display: none;
-			}
-			.has-regexp .test-regexp {
-				display: inline-block;
-			}
-			.regexp-report summary, .regexp-report div {
-				cursor: pointer;
-				outline: none;
-			}
-			.regexp-report mark {
-				background-color: rgba(255, 255, 0, .5);
-			}
-			.regexp-report details {
-				margin-left: 1rem;
-			}
-			.regexp-report details:not(:last-child) {
-				margin-bottom: 1rem;
-			}
-			.regexp-report summary {
-				font-weight: bold;
-				margin-left: -1rem;
-				margin-bottom: .5rem;
-				outline: none;
-				cursor: default;
-			}
-			.regexp-report details[data-type="full"] {
-				color: darkgreen;
-			}
-			.regexp-report details[data-type="partial"] {
-				color: darkgray;
-			}
-			.regexp-report details[data-type="invalid"] {
-				color: maroon;
-			}
-			.regexp-report details details {
-				margin-left: 2rem;
-				margin-top: .5rem;
-			}
-			.regexp-report .svg-icon {
-				position: absolute;
-				margin-top: -1px;
-			}
-			.regexp-report details div:hover {
-				text-decoration: underline;
-				text-decoration-skip: ink;
-			}
-			.regexp-report details div img {
-				width: 16px;
-				max-height: 16px;
-				position: absolute;
-				margin-left: -20px;
-				margin-top: -1px;
-				animation: fadein 1s cubic-bezier(.03, .67, .08, .94);
-				animation-fill-mode: both;
-			}
-			/************ help popup ************/
-			#help-popup {
-				top: 3rem;
-				right: 3rem;
-				max-width: 50vw;
-				position: fixed;
-				display: none;
-				background-color: white;
-				box-shadow: 3px 3px 30px rgba(0, 0, 0, 0.5);
-				padding: 0.5rem;
-				z-index: 99;
-			}
-			#help-popup.big {
-				max-width: 100%;
-				left: 3rem;
-			}
-			#help-popup.big .CodeMirror {
-				min-height: 2rem;
-				height: 70vh;
-			}
-			#help-popup .title {
-				font-weight: bold;
-				background-color: rgba(0,0,0,0.05);
-				margin: -0.5rem -0.5rem 0.5rem;
-				padding: .5rem 32px .5rem .5rem;
-			}
-			#help-popup .contents {
-				max-height: calc(100vh - 8rem);
-				overflow-y: auto;
-			}
-			#help-popup .dismiss {
-				position: absolute;
-				right: 4px;
-				top: .5em;
-			}
+  <body id="stylus-edit">
+    <div id="header">
+      <h1 id="heading">&nbsp;</h1> <!-- nbsp allocates the actual height which prevents page shift -->
+      <section id="basic-info">
+        <div id="basic-info-name">
+          <input id="name" class="style-contributor" i18n-placeholder="styleMissingName" spellcheck="false">
+          <a id="url" target="_blank"><svg class="svg-icon"><use xlink:href="#svg-icon-external-link"/></svg></a>
+        </div>
+        <div id="basic-info-enabled">
+          <input type="checkbox" id="enabled" class="style-contributor">
+          <label for="enabled" id="enabled-label" i18n-text="styleEnabledLabel"></label><!--
+          --><svg id="toggle-style-help" class="svg-icon info">
+            <use xlink:href="#svg-icon-help"/>
+          </svg>
+        </div>
+      </section>
+      <section id="actions">
+        <div>
+          <button id="save-button" title="Ctrl-S" i18n-text="styleSaveLabel"></button>
+          <button id="beautify" i18n-text="styleBeautify"></button>
+          <a href="manage.html"><button id="cancel-button" i18n-text="styleCancelEditLabel"></button></a>
+        </div>
+        <div>
+          <h2 id="mozilla-format-heading" i18n-text="styleMozillaFormatHeading"><svg id="to-mozilla-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></h2>
+          <button id="from-mozilla" i18n-text="importLabel"></button>
+          <button id="to-mozilla" i18n-text="exportLabel"></button>
+        </div>
+      </section>
+      <section id="options">
+        <h2 id="options-heading" i18n-text="optionsHeading"></h2>
+        <div class="option">
+          <input id="editor.lineWrapping" type="checkbox">
+          <label id="lineWrapping-label" for="editor.lineWrapping" i18n-text="cm_lineWrapping"></label>
+        </div>
+        <div class="option">
+          <input id="editor.smartIndent" type="checkbox">
+          <label id="smartIndent-label" for="editor.smartIndent" i18n-text="cm_smartIndent"></label>
+        </div>
+        <div class="option">
+          <input id="editor.indentWithTabs" type="checkbox">
+          <label id="indentWithTabs-label" for="editor.indentWithTabs" i18n-text="cm_indentWithTabs"></label>
+        </div>
+        <div class="option">
+          <input id="editor.autocompleteOnTyping" type="checkbox">
+          <label for="editor.autocompleteOnTyping" i18n-text="cm_autocompleteOnTyping"></label>
+        </div>
+        <div class="option aligned">
+          <label id="tabSize-label" for="editor.tabSize" i18n-text="cm_tabSize"></label>
+          <input id="editor.tabSize" type="number" min="0">
+        </div>
+        <div class="option aligned">
+          <label id="keyMap-label" for="editor.keyMap" i18n-text="cm_keyMap"></label>
+          <select id="editor.keyMap"></select>
+          <svg id="keyMap-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg>
+        </div>
+        <div class="option aligned">
+          <label id="theme-label" for="editor.theme" i18n-text="cm_theme"></label>
+          <select id="editor.theme"></select>
+        </div>
+        <div class="option aligned">
+          <label id="highlight-label" for="editor.matchHighlight" i18n-text="cm_matchHighlight"></label>
+          <select id="editor.matchHighlight">
+            <option i18n-text="cm_matchHighlightToken" value="token">
+            <option i18n-text="cm_matchHighlightSelection" value="selection">
+            <option i18n-text="genericDisabledLabel" value="">
+          </select>
+        </div>
+      </section>
+      <section id="lint"><h2 i18n-text="issues">: <span id="issue-count"></span><svg id="lint-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></h2><div></div></section>
+    </div>
+    <section id="sections">
+      <h2><span id="sections-heading" i18n-text="styleSectionsTitle"></span><svg id="sections-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></h2>
+    </section>
+    <div id="help-popup">
+      <div class="title"></div><svg id="sections-help" class="svg-icon dismiss"><use xlink:href="#svg-icon-close"/></svg></svg>
+      <div class="contents"></div>
+    </div>
 
-			.keymap-list {
-				font-size: 85%;
-				line-height: 1.0;
-				border-spacing: 0;
-				word-break: break-all;
-			}
-			.keymap-list input {
-				width: 100%;
-			}
-			.keymap-list tr:nth-child(odd) {
-				background-color: rgba(0, 0, 0, 0.07);
-			}
-			.keymap-list td:first-child {
-				white-space: nowrap;
-				font-family: monospace;
-				padding-right: 0.5rem;
-			}
+    <svg xmlns="http://www.w3.org/2000/svg" style="display: none">
+      <symbol id="svg-icon-external-link" height="16" width="16" viewBox="0 0 8 8">
+        <path d="M0 0v8h8v-2h-1v1h-6v-6h1v-1h-2zm4 0l1.5 1.5-2.5 2.5 1 1 2.5-2.5 1.5 1.5v-4h-4z"></path>
+      </symbol>
+      <symbol id="svg-icon-help" height="16" width="14" viewBox="0 0 14 16" i18n-alt="helpAlt">
+        <path fill-rule="evenodd" d="M6.3 5.69a.942.942 0 0 1-.28-.7c0-.28.09-.52.28-.7.19-.18.42-.28.7-.28.28 0 .52.09.7.28.18.19.28.42.28.7 0 .28-.09.52-.28.7a1 1 0 0 1-.7.3c-.28 0-.52-.11-.7-.3zM8 7.99c-.02-.25-.11-.48-.31-.69-.2-.19-.42-.3-.69-.31H6c-.27.02-.48.13-.69.31-.2.2-.3.44-.31.69h1v3c.02.27.11.5.31.69.2.2.42.31.69.31h1c.27 0 .48-.11.69-.31.2-.19.3-.42.31-.69H8V7.98v.01zM7 2.3c-3.14 0-5.7 2.54-5.7 5.68 0 3.14 2.56 5.7 5.7 5.7s5.7-2.55 5.7-5.7c0-3.15-2.56-5.69-5.7-5.69v.01zM7 .98c3.86 0 7 3.14 7 7s-3.14 7-7 7-7-3.12-7-7 3.14-7 7-7z"></path>
+      </symbol>
+      <symbol id="svg-icon-close" height="16" width="12" viewBox="0 0 12 16">
+        <path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"></path>
+      </symbol>
+    </svg>
 
-			#help-popup button[name^="import"] {
-				line-height: 1.5rem;
-				padding: 0 0.5rem;
-				margin: 0.5rem 0 0 0.5rem;
-				pointer-events: none;
-				opacity: 0.5;
-				float: right;
-			}
-			#help-popup.ready button[name^="import"] {
-				pointer-events: all;
-				opacity: 1.0;
-			}
-
-			/************ lint ************/
-			#lint {
-				display: none;
-			}
-			#lint > div {
-				overflow-y: auto;
-			}
-			#lint table {
-				font-size: 100%;
-				border-spacing: 0;
-				margin-bottom: 1rem;
-				line-height: 1.0;
-			}
-			#lint table:last-child {
-				margin-bottom: 0;
-			}
-			#lint caption {
-				text-align: left;
-				font-weight: bold;
-			}
-			#lint tbody {
-				font-size: 85%;
-				cursor: pointer;
-			}
-			#lint tr:hover {
-				background-color: rgba(0, 0, 0, 0.1);
-			}
-			#lint td[role="severity"] {
-				font-size: 0;
-				width: 16px;
-				padding-right: 0.25rem;
-			}
-			#lint td[role="line"], #lint td[role="sep"] {
-				text-align: right;
-				padding-right: 0;
-			}
-			#lint td[role="col"] {
-				text-align: left;
-				padding-right: 0.25rem;
-			}
-			#lint td[role="message"] {
-				text-align: left;
-			}
-
-			/************ CSS beautifier ************/
-			.beautify-options {
-				white-space: nowrap;
-				font-family: monospace;
-			}
-			.beautify-options div {
-				float: left;
-			}
-			.beautify-options div[newline="true"] + div {
-				clear: left;
-			}
-			.beautify-options div[newline="true"] + div span[indent] {
-				padding-left: 2rem;
-			}
-			.beautify-options:after {
-				clear: both;
-				display: block;
-				content: " ";
-				height: 1rem;
-			}
-			.beautify-options span {
-				font-weight: bold;
-			}
-			.beautify-options select {
-				border: none;
-				background-color: rgba(0, 0, 0, 0.05);
-			}
-
-			/************ reponsive layouts ************/
-			@media(max-width:737px) {
-				#header {
-					width: auto;
-					height: auto;
-					position: inherit;
-					border-right: none;
-					border-bottom: 1px dashed #AAA;
-				}
-				#header section:not(:last-child) {
-					margin-bottom: 0.4rem;
-				}
-				#header input[type="checkbox"] {
-					vertical-align: middle;
-				}
-				h2 {
-					display: none;
-				}
-				#basic-info {
-					display: flex;
-					align-items: baseline;
-				}
-				#basic-info > * {
-					flex: auto;
-				}
-				#basic-info > *:first-child {
-					flex-grow: 99;
-					display: flex;
-				}
-				#basic-info > *:not(:last-child) {
-					margin-right: 0.8rem;
-				}
-				#basic-info #name {
-					width: auto;
-					flex-grow: 99;
-				}
-				#actions {
-					margin-top: 1rem;
-				}
-				#actions > * {
-					display: inline-block;
-				}
-				#options {
-					-webkit-column-count: 2;
-				}
-				#options .aligned > *:not(svg) {
-					margin: 1px 0 0 0; /* workaround the flowing-padding column bug in webkit */
-					padding-right: 0.4rem;
-					vertical-align: baseline;
-					min-height: 1.4rem;
-				}
-				.option {
-					-webkit-column-break-inside: avoid;
-				}
-				.option label {
-					line-height: 1.25rem;
-					margin: 0;
-				}
-				#options [type="number"] {
-					text-align: left; /* workaround the column flow bug in webkit */
-					padding-left: 0.2rem;
-				}
-				#options #tabSize-label {
-					position: relative;
-					top: 0.2rem;
-				}
-				#lint h2 {
-					display: block;
-					cursor: default;
-					margin-bottom: 0;
-				}
-				#lint > div {
-					max-height: 0;
-				}
-				#lint.collapsed > div {
-					display: none;
-				}
-				#lint:hover > div {
-					margin-top: 1em;
-					max-height: 30vh;
-				}
-				#sections {
-					padding-left: 0;
-				}
-				#sections > div {
-					padding: 0;
-				}
-				#sections > *:not(h2) {
-					padding-left: 0.4rem;
-				}
-				.applies-type {
-					width: 30%;
-				}
-			}
-			@media(max-width:500px) {
-				#options {
-					-webkit-column-count: 1;
-				}
-				#options #tabSize-label {
-					position: static;
-				}
-			}
-		</style>
-		<link id="cm-theme" rel="stylesheet">
-
-		<template data-id="appliesTo">
-			<li>
-				<select name="applies-type" class="applies-type style-contributor">
-					<option value="url" i18n-text="appliesUrlOption"></option>
-					<option value="url-prefix" i18n-text="appliesUrlPrefixOption"></option>
-					<option value="domain" i18n-text="appliesDomainOption"></option>
-					<option value="regexp" i18n-text="appliesRegexpOption"></option>
-				</select>
-				<input name="applies-value" class="applies-value style-contributor">
-				<button class="remove-applies-to" i18n-text="appliesRemove"></button>
-				<button class="add-applies-to" i18n-text="appliesAdd"></button>
-			</li>
-		</template>
-		<template data-id="appliesToEverything">
-			<li class="applies-to-everything" i18n-html="appliesToEverything">
-				<button class="add-applies-to" i18n-text="appliesSpecify"></button>
-			</li>
-		</template>
-		<template data-id="section">
-			<div>
-				<label i18n-text="sectionCode"></label>
-				<textarea class="code"></textarea>
-				<br>
-				<div class="applies-to">
-					<label i18n-text="appliesLabel">
-						<svg class="svg-icon info applies-to-help"><use xlink:href="#svg-icon-help"/></svg>
-					</label>
-					<ul class="applies-to-list"></ul>
-				</div>
-				<button class="remove-section" i18n-text="sectionRemove"></button>
-				<button class="add-section" i18n-text="sectionAdd"></button>
-				<button class="beautify-section" i18n-text="styleBeautify"></button>
-				<button class="test-regexp" i18n-text="styleRegexpTestButton"></button>
-			</div>
-		</template>
-		<template data-id="find">
-			<span i18n-text="search">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
-				<span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
-			</span>
-		</template>
-		<template data-id="replace">
-			<span i18n-text="replace">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
-				<span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
-			</span>
-		</template>
-		<template data-id="replaceAll">
-			<span i18n-text="replaceAll">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
-				<span class="CodeMirror-search-hint">(<span i18n-text="searchRegexp"></span>)</span>
-			</span>
-		</template>
-		<template data-id="replaceWith">
-			<span i18n-text="replaceWith">: <input type="text" class="CodeMirror-search-field" spellcheck="false">
-			</span>
-		</template>
-		<template data-id="replaceConfirm">
-			<span i18n-text="replace">?
-				<button i18n-text="confirmYes"></button>
-				<button i18n-text="confirmNo"></button>
-				<button i18n-text="confirmStop"></button>
-			</span>
-		</template>
-		<template data-id="jumpToLine">
-			<span i18n-text="editGotoLine">: <input class="CodeMirror-jump-field" type="text"></span>
-		</template>
-		<template data-id="regexpTestPartial">
-			<a target="_blank" href="https://github.com/stylish-userstyles/stylish/wiki/Applying-styles-to-specific-sites#advanced-matching-with-regular-expressions"><svg class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></a>
-		</template>
-		<template data-id="resizeGrip">
-			<div class="resize-grip" i18n-title="cm_resizeGripHint"></div>
-		</template>
-	</head>
-
-	<body id="stylus-edit">
-		<div id="header">
-			<h1 id="heading">&nbsp;</h1> <!-- nbsp allocates the actual height which prevents page shift -->
-			<section id="basic-info">
-				<div id="basic-info-name">
-					<input id="name" class="style-contributor" i18n-placeholder="styleMissingName" spellcheck="false">
-					<a id="url" target="_blank"><svg class="svg-icon"><use xlink:href="#svg-icon-external-link"/></svg></a>
-				</div>
-				<div id="basic-info-enabled">
-					<input type="checkbox" id="enabled" class="style-contributor">
-					<label for="enabled" id="enabled-label" i18n-text="styleEnabledLabel"></label><!--
-					--><svg id="toggle-style-help" class="svg-icon info">
-						<use xlink:href="#svg-icon-help"/>
-					</svg>
-				</div>
-			</section>
-			<section id="actions">
-				<div>
-					<button id="save-button" title="Ctrl-S" i18n-text="styleSaveLabel"></button>
-					<button id="beautify" i18n-text="styleBeautify"></button>
-					<a href="manage.html"><button id="cancel-button" i18n-text="styleCancelEditLabel"></button></a>
-				</div>
-				<div>
-					<h2 id="mozilla-format-heading" i18n-text="styleMozillaFormatHeading"><svg id="to-mozilla-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></h2>
-					<button id="from-mozilla" i18n-text="importLabel"></button>
-					<button id="to-mozilla" i18n-text="exportLabel"></button>
-				</div>
-			</section>
-			<section id="options">
-				<h2 id="options-heading" i18n-text="optionsHeading"></h2>
-				<div class="option">
-					<input id="editor.lineWrapping" type="checkbox">
-					<label id="lineWrapping-label" for="editor.lineWrapping" i18n-text="cm_lineWrapping"></label>
-				</div>
-				<div class="option">
-					<input id="editor.smartIndent" type="checkbox">
-					<label id="smartIndent-label" for="editor.smartIndent" i18n-text="cm_smartIndent"></label>
-				</div>
-				<div class="option">
-					<input id="editor.indentWithTabs" type="checkbox">
-					<label id="indentWithTabs-label" for="editor.indentWithTabs" i18n-text="cm_indentWithTabs"></label>
-				</div>
-				<div class="option">
-					<input id="editor.autocompleteOnTyping" type="checkbox">
-					<label for="editor.autocompleteOnTyping" i18n-text="cm_autocompleteOnTyping"></label>
-				</div>
-				<div class="option aligned">
-					<label id="tabSize-label" for="editor.tabSize" i18n-text="cm_tabSize"></label>
-					<input id="editor.tabSize" type="number" min="0">
-				</div>
-				<div class="option aligned">
-					<label id="keyMap-label" for="editor.keyMap" i18n-text="cm_keyMap"></label>
-					<select id="editor.keyMap"></select>
-					<svg id="keyMap-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg>
-				</div>
-				<div class="option aligned">
-					<label id="theme-label" for="editor.theme" i18n-text="cm_theme"></label>
-					<select id="editor.theme"></select>
-				</div>
-				<div class="option aligned">
-					<label id="highlight-label" for="editor.matchHighlight" i18n-text="cm_matchHighlight"></label>
-					<select id="editor.matchHighlight">
-						<option i18n-text="cm_matchHighlightToken" value="token">
-						<option i18n-text="cm_matchHighlightSelection" value="selection">
-						<option i18n-text="genericDisabledLabel" value="">
-					</select>
-				</div>
-			</section>
-			<section id="lint"><h2 i18n-text="issues">: <span id="issue-count"></span><svg id="lint-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></h2><div></div></section>
-		</div>
-		<section id="sections">
-			<h2><span id="sections-heading" i18n-text="styleSectionsTitle"></span><svg id="sections-help" class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg></h2>
-		</section>
-		<div id="help-popup">
-			<div class="title"></div><svg id="sections-help" class="svg-icon dismiss"><use xlink:href="#svg-icon-close"/></svg></svg>
-			<div class="contents"></div>
-		</div>
-
-		<svg xmlns="http://www.w3.org/2000/svg" style="display: none">
-			<symbol id="svg-icon-external-link" height="16" width="16" viewBox="0 0 8 8">
-				<path d="M0 0v8h8v-2h-1v1h-6v-6h1v-1h-2zm4 0l1.5 1.5-2.5 2.5 1 1 2.5-2.5 1.5 1.5v-4h-4z"></path>
-			</symbol>
-			<symbol id="svg-icon-help" height="16" width="14" viewBox="0 0 14 16" i18n-alt="helpAlt">
-				<path fill-rule="evenodd" d="M6.3 5.69a.942.942 0 0 1-.28-.7c0-.28.09-.52.28-.7.19-.18.42-.28.7-.28.28 0 .52.09.7.28.18.19.28.42.28.7 0 .28-.09.52-.28.7a1 1 0 0 1-.7.3c-.28 0-.52-.11-.7-.3zM8 7.99c-.02-.25-.11-.48-.31-.69-.2-.19-.42-.3-.69-.31H6c-.27.02-.48.13-.69.31-.2.2-.3.44-.31.69h1v3c.02.27.11.5.31.69.2.2.42.31.69.31h1c.27 0 .48-.11.69-.31.2-.19.3-.42.31-.69H8V7.98v.01zM7 2.3c-3.14 0-5.7 2.54-5.7 5.68 0 3.14 2.56 5.7 5.7 5.7s5.7-2.55 5.7-5.7c0-3.15-2.56-5.69-5.7-5.69v.01zM7 .98c3.86 0 7 3.14 7 7s-3.14 7-7 7-7-3.12-7-7 3.14-7 7-7z"></path>
-			</symbol>
-			<symbol id="svg-icon-close" height="16" width="12" viewBox="0 0 12 16">
-				<path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"></path>
-			</symbol>
-		</svg>
-
-	</body>
+  </body>
 </html>
diff --git a/edit/edit.css b/edit/edit.css
new file mode 100644
index 00000000..f41e93cb
--- /dev/null
+++ b/edit/edit.css
@@ -0,0 +1,576 @@
+body {
+  margin: 0;
+  font: 12px arial,sans-serif;
+}
+/************ header ************/
+#header {
+  width: 280px;
+  height: 100vh;
+  overflow: auto;
+  position: fixed;
+  top: 0;
+  padding: 15px;
+  border-right: 1px dashed #AAA;
+  -webkit-box-shadow: 0 0 3rem -1.2rem black;
+  box-sizing: border-box;
+}
+#header h1 {
+  margin-top: 0;
+}
+#sections {
+  padding-left: 280px;
+}
+#sections h2 {
+  margin-top: 1rem;
+  margin-left: 1.7rem;
+}
+.aligned {
+  display: table-row;
+}
+.aligned > *:not(svg) {
+  display: table-cell;
+  margin-top: 0.1rem;
+  min-height: 1.4rem;
+}
+input[type="checkbox"] {
+  margin-left: 0.1rem;
+}
+/* basic info */
+#basic-info {
+  margin-bottom: 1rem;
+}
+#name {
+  width: 100%;
+}
+#basic-info-name {
+  display: flex;
+  align-items: center;
+}
+#url {
+  margin-left: 0.25rem;
+}
+#url:not([href^="http"]) {
+  display: none;
+}
+#save-button {
+  opacity: .5;
+  pointer-events: none;
+}
+.dirty #save-button {
+  opacity: 1;
+  pointer-events: all;
+}
+.svg-icon {
+  cursor: pointer;
+  vertical-align: middle;
+  transition: fill .5s;
+  width: 16px;
+  height: 16px;
+}
+.svg-icon:not(.dismiss) {
+  margin-left: 0.2rem;
+}
+h2 .svg-icon, label .svg-icon {
+  margin-top: -1px;
+}
+.svg-icon.info {
+  width: 14px;
+  height: 16px;
+}
+.svg-icon:hover,
+.svg-icon.info {
+  fill: #666;
+}
+.svg-icon,
+.svg-icon.info:hover {
+  fill: #000;
+}
+#enabled {
+  margin-left: 0;
+  vertical-align: middle;
+}
+#enabled-label {
+  vertical-align: middle;
+}
+/* actions */
+#actions > * {
+  margin-right: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+/* options */
+#options [type="number"] {
+  max-width: 2.5rem;
+  text-align: right;
+}
+#options .option > * {
+  padding-right: 0.25rem;
+}
+/************ content ***********/
+#sections > div {
+  margin: 0.7rem;
+  padding: 1rem;
+}
+#sections > div:not(:first-of-type) {
+  border-top: 2px solid black;
+}
+#sections > div:only-of-type .remove-section {
+  display: none;
+}
+#sections > div > button:not(:first-of-type) {
+  margin-left: 0.2rem;
+}
+.dirty > label::before {
+  content: "*";
+  font-weight: bold;
+}
+#sections {
+  counter-reset: codebox;
+}
+#sections > div > label::after {
+  counter-increment: codebox;
+  content: counter(codebox);
+  margin-left: 0.25rem;
+}
+/* code */
+.CodeMirror-hint:hover {
+  color: white;
+  background: #08f;
+}
+.code {
+  height: 10rem;
+  width: 40rem;
+}
+.CodeMirror {
+  border: solid #CCC 1px;
+}
+.CodeMirror-scroll {
+  height: auto;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 6px; /* resize-grip height */
+}
+.CodeMirror-lint-mark-warning {
+  background: none;
+}
+.CodeMirror-vscrollbar {
+  margin-bottom: 7px; /* make space for resize-grip */
+}
+.CodeMirror-hscrollbar {
+    bottom: 7px; /* make space for resize-grip */
+}
+.CodeMirror-scrollbar-filler {
+  bottom: 7px; /* make space for resize-grip */
+}
+.CodeMirror-dialog {
+  -webkit-animation: highlight 3s ease-out;
+}
+.CodeMirror-focused {
+  outline: -webkit-focus-ring-color auto 5px;
+  outline-offset: -2px;
+}
+.CodeMirror-search-field {
+  width: 10em;
+}
+.CodeMirror-jump-field {
+  width: 5em;
+}
+.CodeMirror-search-hint {
+  color: #888;
+}
+body[data-match-highlight="token"] .cm-matchhighlight-approved .cm-matchhighlight,
+body[data-match-highlight="token"] .CodeMirror-selection-highlight-scrollbar {
+  animation: fadein-match-highlighter 1s cubic-bezier(.97,.01,.42,.98);
+  animation-fill-mode: both;
+}
+body[data-match-highlight="selection"] .cm-matchhighlight-approved .cm-matchhighlight,
+body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar {
+  background-color: rgba(1, 151, 193, 0.1);
+}
+@-webkit-keyframes highlight {
+  from {
+    background-color: #ff9;
+  }
+  to {
+    background-color: none;
+  }
+}
+@keyframes fadein {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+@keyframes fadein-match-highlighter {
+  from { background-color: transparent; }
+  to   { background-color: rgba(1, 151, 193, 0.1); }
+}
+.resize-grip {
+  position: absolute;
+  display: block;
+  height: 6px;
+  content: "";
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9;
+  cursor: n-resize;
+  background-color: inherit;
+  border-top-width: 1px;
+  border-top-style: solid;
+  border-top-color: inherit;
+}
+.resize-grip:after {
+  content: "";
+  bottom: 2px;
+  left: 0;
+  right: 0;
+  margin: 0 8px;
+  display: block;
+  position: absolute;
+  border-top-width: 2px;
+  border-top-style: dotted;
+  border-top-color: inherit;
+}
+/* applies-to */
+.applies-to {
+  display: flex;
+}
+.applies-to label {
+  flex: auto;
+  margin-top: 0.2rem;
+}
+.applies-to ul {
+  flex: auto;
+  flex-grow: 99;
+  margin: 0;
+  padding: 0;
+}
+.applies-to li {
+  display: flex;
+  list-style-type: none;
+  align-items: center;
+  margin-bottom: 0.35rem;
+}
+.applies-to li > *:not(button) {
+  flex: auto;
+  min-height: 1.4rem;
+  margin-left: 0.35rem;
+}
+.applies-to li .add-applies-to {
+  visibility: hidden;
+  text-align: left;
+}
+.applies-to li:last-child .add-applies-to {
+  visibility: visible
+}
+.applies-to li .add-applies-to:first-child {
+  margin-left: 1rem;
+}
+.applies-to li .applies-value {
+  flex-grow: 99;
+  padding-left: 0.2rem;
+}
+.applies-to img {
+  vertical-align: bottom;
+}
+.test-regexp {
+  display: none;
+}
+.has-regexp .test-regexp {
+  display: inline-block;
+}
+.regexp-report summary, .regexp-report div {
+  cursor: pointer;
+  outline: none;
+}
+.regexp-report mark {
+  background-color: rgba(255, 255, 0, .5);
+}
+.regexp-report details {
+  margin-left: 1rem;
+}
+.regexp-report details:not(:last-child) {
+  margin-bottom: 1rem;
+}
+.regexp-report summary {
+  font-weight: bold;
+  margin-left: -1rem;
+  margin-bottom: .5rem;
+  outline: none;
+  cursor: default;
+}
+.regexp-report details[data-type="full"] {
+  color: darkgreen;
+}
+.regexp-report details[data-type="partial"] {
+  color: darkgray;
+}
+.regexp-report details[data-type="invalid"] {
+  color: maroon;
+}
+.regexp-report details details {
+  margin-left: 2rem;
+  margin-top: .5rem;
+}
+.regexp-report .svg-icon {
+  position: absolute;
+  margin-top: -1px;
+}
+.regexp-report details div:hover {
+  text-decoration: underline;
+  text-decoration-skip: ink;
+}
+.regexp-report details div img {
+  width: 16px;
+  max-height: 16px;
+  position: absolute;
+  margin-left: -20px;
+  margin-top: -1px;
+  animation: fadein 1s cubic-bezier(.03, .67, .08, .94);
+  animation-fill-mode: both;
+}
+/************ help popup ************/
+#help-popup {
+  top: 3rem;
+  right: 3rem;
+  max-width: 50vw;
+  position: fixed;
+  display: none;
+  background-color: white;
+  box-shadow: 3px 3px 30px rgba(0, 0, 0, 0.5);
+  padding: 0.5rem;
+  z-index: 99;
+}
+#help-popup.big {
+  max-width: 100%;
+  left: 3rem;
+}
+#help-popup.big .CodeMirror {
+  min-height: 2rem;
+  height: 70vh;
+}
+#help-popup .title {
+  font-weight: bold;
+  background-color: rgba(0,0,0,0.05);
+  margin: -0.5rem -0.5rem 0.5rem;
+  padding: .5rem 32px .5rem .5rem;
+}
+#help-popup .contents {
+  max-height: calc(100vh - 8rem);
+  overflow-y: auto;
+}
+#help-popup .dismiss {
+  position: absolute;
+  right: 4px;
+  top: .5em;
+}
+
+.keymap-list {
+  font-size: 85%;
+  line-height: 1.0;
+  border-spacing: 0;
+  word-break: break-all;
+}
+.keymap-list input {
+  width: 100%;
+}
+.keymap-list tr:nth-child(odd) {
+  background-color: rgba(0, 0, 0, 0.07);
+}
+.keymap-list td:first-child {
+  white-space: nowrap;
+  font-family: monospace;
+  padding-right: 0.5rem;
+}
+
+#help-popup button[name^="import"] {
+  line-height: 1.5rem;
+  padding: 0 0.5rem;
+  margin: 0.5rem 0 0 0.5rem;
+  pointer-events: none;
+  opacity: 0.5;
+  float: right;
+}
+#help-popup.ready button[name^="import"] {
+  pointer-events: all;
+  opacity: 1.0;
+}
+
+/************ lint ************/
+#lint {
+  display: none;
+}
+#lint > div {
+  overflow-y: auto;
+}
+#lint table {
+  font-size: 100%;
+  border-spacing: 0;
+  margin-bottom: 1rem;
+  line-height: 1.0;
+}
+#lint table:last-child {
+  margin-bottom: 0;
+}
+#lint caption {
+  text-align: left;
+  font-weight: bold;
+}
+#lint tbody {
+  font-size: 85%;
+  cursor: pointer;
+}
+#lint tr:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+#lint td[role="severity"] {
+  font-size: 0;
+  width: 16px;
+  padding-right: 0.25rem;
+}
+#lint td[role="line"], #lint td[role="sep"] {
+  text-align: right;
+  padding-right: 0;
+}
+#lint td[role="col"] {
+  text-align: left;
+  padding-right: 0.25rem;
+}
+#lint td[role="message"] {
+  text-align: left;
+}
+
+/************ CSS beautifier ************/
+.beautify-options {
+  white-space: nowrap;
+  font-family: monospace;
+}
+.beautify-options div {
+  float: left;
+}
+.beautify-options div[newline="true"] + div {
+  clear: left;
+}
+.beautify-options div[newline="true"] + div span[indent] {
+  padding-left: 2rem;
+}
+.beautify-options:after {
+  clear: both;
+  display: block;
+  content: " ";
+  height: 1rem;
+}
+.beautify-options span {
+  font-weight: bold;
+}
+.beautify-options select {
+  border: none;
+  background-color: rgba(0, 0, 0, 0.05);
+}
+
+/************ reponsive layouts ************/
+@media(max-width:737px) {
+  #header {
+    width: auto;
+    height: auto;
+    position: inherit;
+    border-right: none;
+    border-bottom: 1px dashed #AAA;
+  }
+  #header section:not(:last-child) {
+    margin-bottom: 0.4rem;
+  }
+  #header input[type="checkbox"] {
+    vertical-align: middle;
+  }
+  h2 {
+    display: none;
+  }
+  #basic-info {
+    display: flex;
+    align-items: baseline;
+  }
+  #basic-info > * {
+    flex: auto;
+  }
+  #basic-info > *:first-child {
+    flex-grow: 99;
+    display: flex;
+  }
+  #basic-info > *:not(:last-child) {
+    margin-right: 0.8rem;
+  }
+  #basic-info #name {
+    width: auto;
+    flex-grow: 99;
+  }
+  #actions {
+    margin-top: 1rem;
+  }
+  #actions > * {
+    display: inline-block;
+  }
+  #options {
+    -webkit-column-count: 2;
+  }
+  #options .aligned > *:not(svg) {
+    margin: 1px 0 0 0; /* workaround the flowing-padding column bug in webkit */
+    padding-right: 0.4rem;
+    vertical-align: baseline;
+    min-height: 1.4rem;
+  }
+  .option {
+    -webkit-column-break-inside: avoid;
+  }
+  .option label {
+    line-height: 1.25rem;
+    margin: 0;
+  }
+  #options [type="number"] {
+    text-align: left; /* workaround the column flow bug in webkit */
+    padding-left: 0.2rem;
+  }
+  #options #tabSize-label {
+    position: relative;
+    top: 0.2rem;
+  }
+  #lint h2 {
+    display: block;
+    cursor: default;
+    margin-bottom: 0;
+  }
+  #lint > div {
+    max-height: 0;
+  }
+  #lint.collapsed > div {
+    display: none;
+  }
+  #lint:hover > div {
+    margin-top: 1em;
+    max-height: 30vh;
+  }
+  #sections {
+    padding-left: 0;
+  }
+  #sections > div {
+    padding: 0;
+  }
+  #sections > *:not(h2) {
+    padding-left: 0.4rem;
+  }
+  .applies-type {
+    width: 30%;
+  }
+}
+@media(max-width:500px) {
+  #options {
+    -webkit-column-count: 1;
+  }
+  #options #tabSize-label {
+    position: static;
+  }
+}
diff --git a/edit/edit.js b/edit/edit.js
index 48ee1bad..413f2a13 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -42,7 +42,7 @@ new MutationObserver((mutations, observer) => {
 	const themeElement = document.getElementById("cm-theme");
 	if (themeElement) {
 		themeElement.href = prefs.get("editor.theme") == "default" ? ""
-			: "codemirror/theme/" + prefs.get("editor.theme") + ".css";
+			: "vendor/codemirror/theme/" + prefs.get("editor.theme") + ".css";
 		observer.disconnect();
 	}
 }).observe(document, {subtree: true, childList: true});
@@ -305,7 +305,7 @@ function acmeEventListener(event) {
 				el.selectedIndex = 0;
 				break;
 			}
-			var url = chrome.runtime.getURL("codemirror/theme/" + value + ".css");
+			var url = chrome.runtime.getURL("vendor/codemirror/theme/" + value + ".css");
 			if (themeLink.href == url) { // preloaded in initCodeMirror()
 				break;
 			}
@@ -1116,7 +1116,7 @@ function beautify(event) {
 		doBeautify();
 	} else {
 		var script = document.head.appendChild(document.createElement("script"));
-		script.src = "beautify/beautify-css-mod.js";
+		script.src = "vendor-overwrites/beautify/beautify-css-mod.js";
 		script.onload = doBeautify;
 	}
 	function doBeautify() {
@@ -2019,7 +2019,7 @@ function getCodeMirrorThemes() {
 	}
 	return new Promise(resolve => {
 		chrome.runtime.getPackageDirectoryEntry(rootDir => {
-			rootDir.getDirectory('codemirror/theme', {create: false}, themeDir => {
+			rootDir.getDirectory('vendor/codemirror/theme', {create: false}, themeDir => {
 				themeDir.createReader().readEntries(entries => {
 					const themes = [
 						chrome.i18n.getMessage('defaultTheme')
diff --git a/index.html b/index.html
index 3a7318be..ea19ac4f 100644
--- a/index.html
+++ b/index.html
@@ -2,12 +2,12 @@
 <html id="stylus">
 <head>
   <title i18n-text-append="optionsHeading">Stylus </title>
-  <link rel="stylesheet" href="index.css">
-  <script src="/dom.js"></script>
-  <script src="/messaging.js"></script>
-  <script src="/localization.js"></script>
-  <script src="/prefs.js"></script>
-  <script src="/apply.js"></script>
+  <link rel="stylesheet" href="options/index.css">
+  <script src="js/dom.js"></script>
+  <script src="background/messaging.js"></script>
+  <script src="js/localization.js"></script>
+  <script src="js/prefs.js"></script>
+  <script src="content/apply.js"></script>
 </head>
 
 <body>
@@ -128,6 +128,6 @@
     </ol>
   </div>
 
-  <script src="index.js"></script>
+  <script src="options/index.js"></script>
 </body>
 </html>
diff --git a/manage.html b/manage.html
index 5fc34411..855db9eb 100644
--- a/manage.html
+++ b/manage.html
@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <title i18n-text="manageTitle"></title>
-  <link rel="stylesheet" href="manage.css">
+  <link rel="stylesheet" href="manage/manage.css">
   <link rel="stylesheet" href="msgbox/msgbox.css">
 
   <style id="style-overrides"></style>
@@ -121,12 +121,12 @@
     </details>
   </template>
 
-  <script src="dom.js"></script>
-  <script src="messaging.js"></script>
-  <script src="prefs.js"></script>
-  <script src="apply.js"></script>
-  <script src="localization.js"></script>
-  <script src="manage.js"></script>
+  <script src="js/dom.js"></script>
+  <script src="background/messaging.js"></script>
+  <script src="js/prefs.js"></script>
+  <script src="content/apply.js"></script>
+  <script src="js/localization.js"></script>
+  <script src="manage/manage.js"></script>
 </head>
 
 <body id="stylus-manage" i18n-dragndrop-hint="dragDropMessage">
@@ -216,7 +216,7 @@
 </div>
 <div id="installed"></div>
 
-<script src="backup/fileSaveLoad.js"></script>
+<script src="manage/fileSaveLoad.js"></script>
 <script src="msgbox/msgbox.js"></script>
 
 </body>
diff --git a/manifest.json b/manifest.json
index 4f2ccca1..97b600e4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -19,7 +19,13 @@
     "<all_urls>"
   ],
   "background": {
-    "scripts": ["messaging.js", "storage.js", "prefs.js", "background.js", "update.js"]
+    "scripts": [
+      "background/messaging.js",
+      "background/storage.js",
+      "js/prefs.js",
+      "background/background.js",
+      "background/update.js"
+    ]
   },
   "commands": {
     "openManage": {
@@ -35,13 +41,13 @@
       "run_at": "document_start",
       "all_frames": true,
       "match_about_blank": true,
-      "js": ["apply.js"]
+      "js": ["content/apply.js"]
     },
     {
       "matches": ["http://userstyles.org/*", "https://userstyles.org/*"],
       "run_at": "document_start",
       "all_frames": false,
-      "js": ["install.js"]
+      "js": ["content/install.js"]
     }
   ],
   "browser_action": {
@@ -56,7 +62,7 @@
   },
   "default_locale": "en",
   "options_ui": {
-    "page": "options/index.html",
+    "page": "index.html",
     "chrome_style": true
   }
 }
diff --git a/options/index.js b/options/index.js
index decc038d..68e6b955 100644
--- a/options/index.js
+++ b/options/index.js
@@ -15,7 +15,7 @@ document.onclick = e => {
 
   switch (target.dataset.cmd) {
     case 'open-manage':
-      openURL({url: '/manage.html'});
+      openURL({url: 'manage.html'});
       break;
 
     case 'check-updates':
diff --git a/popup.html b/popup.html
index 7684eb05..fe5c967f 100644
--- a/popup.html
+++ b/popup.html
@@ -2,7 +2,7 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-  <link rel="stylesheet" href="popup.css">
+  <link rel="stylesheet" href="popup/popup.css">
 
   <!-- Notes:
     * Chrome doesn't garbage-collect (or even leaks) SVG <symbol> referenced via <use> so we'll embed the code directly
@@ -55,12 +55,12 @@
     </div>
   </template>
 
-  <script src="dom.js"></script>
-  <script src="messaging.js"></script>
-  <script src="localization.js"></script>
-  <script src="prefs.js"></script>
-  <script src="apply.js"></script>
-  <script src="popup.js"></script>
+  <script src="js/dom.js"></script>
+  <script src="background/messaging.js"></script>
+  <script src="js/localization.js"></script>
+  <script src="js/prefs.js"></script>
+  <script src="content/apply.js"></script>
+  <script src="popup/popup.js"></script>
 </head>
 
 <body id="stylus-popup">
diff --git a/tools/pull_locales_postprocess.py b/tools/pull_locales_postprocess.py
index a57ebc2d..d9d0b43a 100644
--- a/tools/pull_locales_postprocess.py
+++ b/tools/pull_locales_postprocess.py
@@ -2,7 +2,7 @@
 import io, os, json, re
 from collections import OrderedDict
 
-with io.open('_locales/en/messages.json', 'r', encoding='utf-8') as f:
+with io.open('/_locales/en/messages.json', 'r', encoding='utf-8') as f:
     items = json.load(f).items()
     english = [(k, v['message']) for k, v in items if 'message' in v]
     english_placeholders = [(k, v['placeholders']) for k,v in items
@@ -14,7 +14,7 @@ for locale_name in os.listdir('_locales'):
     if not re.match(r'^\w{2}(_\w{2,3})?$', locale_name):
         print('Skipped %s: not a locale dir' % locale_name)
         continue
-    loc_path = '_locales/' + locale_name + '/messages.json'
+    loc_path = '/_locales/' + locale_name + '/messages.json'
     with io.open(loc_path, 'r+', encoding='utf-8') as f:
         loc = json.load(f, object_pairs_hook=OrderedDict)
 

From 508f71f26ba1414240ab45620af43096d9d931ad Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Wed, 12 Jul 2017 14:50:13 -0500
Subject: [PATCH 75/94] Change tabs to spaces in edit.js

---
 edit/edit.js | 3386 +++++++++++++++++++++++++-------------------------
 1 file changed, 1693 insertions(+), 1693 deletions(-)

diff --git a/edit/edit.js b/edit/edit.js
index 413f2a13..93c2ba4b 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -17,7 +17,7 @@ onBackgroundReady();
 
 // make querySelectorAll enumeration code readable
 ["forEach", "some", "indexOf", "map"].forEach(function(method) {
-	NodeList.prototype[method]= Array.prototype[method];
+  NodeList.prototype[method]= Array.prototype[method];
 });
 
 // Chrome pre-34
@@ -25,2013 +25,2013 @@ Element.prototype.matches = Element.prototype.matches || Element.prototype.webki
 
 // Chrome pre-41 polyfill
 Element.prototype.closest = Element.prototype.closest || function(selector) {
-	for (var e = this; e && !e.matches(selector); e = e.parentElement) {}
-	return e;
+  for (var e = this; e && !e.matches(selector); e = e.parentElement) {}
+  return e;
 };
 
 Array.prototype.rotate = function(amount) { // negative amount == rotate left
-	var r = this.slice(-amount, this.length);
-	Array.prototype.push.apply(r, this.slice(0, this.length - r.length));
-	return r;
+  var r = this.slice(-amount, this.length);
+  Array.prototype.push.apply(r, this.slice(0, this.length - r.length));
+  return r;
 };
 
 Object.defineProperty(Array.prototype, "last", {get: function() { return this[this.length - 1]; }});
 
 // preload the theme so that CodeMirror can calculate its metrics in DOMContentLoaded->setupLivePrefs()
 new MutationObserver((mutations, observer) => {
-	const themeElement = document.getElementById("cm-theme");
-	if (themeElement) {
-		themeElement.href = prefs.get("editor.theme") == "default" ? ""
-			: "vendor/codemirror/theme/" + prefs.get("editor.theme") + ".css";
-		observer.disconnect();
-	}
+  const themeElement = document.getElementById("cm-theme");
+  if (themeElement) {
+    themeElement.href = prefs.get("editor.theme") == "default" ? ""
+      : "vendor/codemirror/theme/" + prefs.get("editor.theme") + ".css";
+    observer.disconnect();
+  }
 }).observe(document, {subtree: true, childList: true});
 
 getCodeMirrorThemes();
 
 // reroute handling to nearest editor when keypress resolves to one of these commands
 var hotkeyRerouter = {
-	commands: {
-		save: true, jumpToLine: true, nextEditor: true, prevEditor: true,
-		find: true, findNext: true, findPrev: true, replace: true, replaceAll: true,
-		toggleStyle: true,
-	},
-	setState: function(enable) {
-		setTimeout(function() {
-			document[(enable ? "add" : "remove") + "EventListener"]("keydown", hotkeyRerouter.eventHandler);
-		}, 0);
-	},
-	eventHandler: function(event) {
-		var keyName = CodeMirror.keyName(event);
-		if ("handled" == CodeMirror.lookupKey(keyName, CodeMirror.getOption("keyMap"), handleCommand)
-		 || "handled" == CodeMirror.lookupKey(keyName, CodeMirror.defaults.extraKeys, handleCommand)) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
-		function handleCommand(command) {
-			if (hotkeyRerouter.commands[command] === true) {
-				CodeMirror.commands[command](getEditorInSight(event.target));
-				return true;
-			}
-		}
-	}
+  commands: {
+    save: true, jumpToLine: true, nextEditor: true, prevEditor: true,
+    find: true, findNext: true, findPrev: true, replace: true, replaceAll: true,
+    toggleStyle: true,
+  },
+  setState: function(enable) {
+    setTimeout(function() {
+      document[(enable ? "add" : "remove") + "EventListener"]("keydown", hotkeyRerouter.eventHandler);
+    }, 0);
+  },
+  eventHandler: function(event) {
+    var keyName = CodeMirror.keyName(event);
+    if ("handled" == CodeMirror.lookupKey(keyName, CodeMirror.getOption("keyMap"), handleCommand)
+     || "handled" == CodeMirror.lookupKey(keyName, CodeMirror.defaults.extraKeys, handleCommand)) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+    function handleCommand(command) {
+      if (hotkeyRerouter.commands[command] === true) {
+        CodeMirror.commands[command](getEditorInSight(event.target));
+        return true;
+      }
+    }
+  }
 };
 
 function onChange(event) {
-	var node = event.target;
-	if ("savedValue" in node) {
-		var currentValue = "checkbox" === node.type ? node.checked : node.value;
-		setCleanItem(node, node.savedValue === currentValue);
-	} else {
-		// the manually added section's applies-to is dirty only when the value is non-empty
-		setCleanItem(node, node.localName != "input" || !node.value.trim());
-		delete node.savedValue; // only valid when actually saved
-	}
-	updateTitle();
+  var node = event.target;
+  if ("savedValue" in node) {
+    var currentValue = "checkbox" === node.type ? node.checked : node.value;
+    setCleanItem(node, node.savedValue === currentValue);
+  } else {
+    // the manually added section's applies-to is dirty only when the value is non-empty
+    setCleanItem(node, node.localName != "input" || !node.value.trim());
+    delete node.savedValue; // only valid when actually saved
+  }
+  updateTitle();
 }
 
 // Set .dirty on stylesheet contributors that have changed
 function setDirtyClass(node, isDirty) {
-	node.classList.toggle("dirty", isDirty);
+  node.classList.toggle("dirty", isDirty);
 }
 
 function setCleanItem(node, isClean) {
-	if (!node.id) {
-		node.id = Date.now().toString(32).substr(-6);
-	}
+  if (!node.id) {
+    node.id = Date.now().toString(32).substr(-6);
+  }
 
-	if (isClean) {
-		delete dirty[node.id];
-		// code sections have .CodeMirror property
-		if (node.CodeMirror) {
-			node.savedValue = node.CodeMirror.changeGeneration();
-		} else {
-			node.savedValue = "checkbox" === node.type ? node.checked : node.value;
-		}
-	} else {
-		dirty[node.id] = true;
-	}
+  if (isClean) {
+    delete dirty[node.id];
+    // code sections have .CodeMirror property
+    if (node.CodeMirror) {
+      node.savedValue = node.CodeMirror.changeGeneration();
+    } else {
+      node.savedValue = "checkbox" === node.type ? node.checked : node.value;
+    }
+  } else {
+    dirty[node.id] = true;
+  }
 
-	setDirtyClass(node, !isClean);
+  setDirtyClass(node, !isClean);
 }
 
 function isCleanGlobal() {
-	var clean = Object.keys(dirty).length == 0;
-	setDirtyClass(document.body, !clean);
+  var clean = Object.keys(dirty).length == 0;
+  setDirtyClass(document.body, !clean);
     var saveBtn = document.getElementById("save-button")
     if (clean){
         //saveBtn.removeAttribute('disabled');
     }else{
         //saveBtn.setAttribute('disabled', true);
     }
-	return clean;
+  return clean;
 }
 
 function setCleanGlobal() {
-	document.querySelectorAll("#header, #sections > div").forEach(setCleanSection);
-	dirty = {}; // forget the dirty applies-to ids from a deleted section after the style was saved
+  document.querySelectorAll("#header, #sections > div").forEach(setCleanSection);
+  dirty = {}; // forget the dirty applies-to ids from a deleted section after the style was saved
 }
 
 function setCleanSection(section) {
-	section.querySelectorAll(".style-contributor").forEach(function(node) { setCleanItem(node, true) });
+  section.querySelectorAll(".style-contributor").forEach(function(node) { setCleanItem(node, true) });
 
-	// #header section has no codemirror
-	var cm = section.CodeMirror;
-	if (cm) {
-		section.savedValue = cm.changeGeneration();
-		indicateCodeChange(cm);
-	}
+  // #header section has no codemirror
+  var cm = section.CodeMirror;
+  if (cm) {
+    section.savedValue = cm.changeGeneration();
+    indicateCodeChange(cm);
+  }
 }
 
 function initCodeMirror() {
-	var CM = CodeMirror;
-	var isWindowsOS = navigator.appVersion.indexOf("Windows") > 0;
+  var CM = CodeMirror;
+  var isWindowsOS = navigator.appVersion.indexOf("Windows") > 0;
 
-	// CodeMirror miserably fails on keyMap="" so let's ensure it's not
-	if (!prefs.get('editor.keyMap')) {
-		prefs.reset('editor.keyMap');
-	}
+  // CodeMirror miserably fails on keyMap="" so let's ensure it's not
+  if (!prefs.get('editor.keyMap')) {
+    prefs.reset('editor.keyMap');
+  }
 
-	// default option values
-	Object.assign(CM.defaults, {
-		mode: 'css',
-		lineNumbers: true,
-		lineWrapping: true,
-		foldGutter: true,
-		gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter", "CodeMirror-lint-markers"],
-		matchBrackets: true,
-		highlightSelectionMatches: {showToken: /[#.\-\w]/, annotateScrollbar: true},
-		hintOptions: {},
-		lint: {getAnnotations: CodeMirror.lint.css, delay: prefs.get("editor.lintDelay")},
-		lintReportDelay: prefs.get("editor.lintReportDelay"),
-		styleActiveLine: true,
-		theme: "default",
-		keyMap: prefs.get("editor.keyMap"),
-		extraKeys: { // independent of current keyMap
-			"Alt-Enter": "toggleStyle",
-			"Alt-PageDown": "nextEditor",
-			"Alt-PageUp": "prevEditor"
-		}
-	}, prefs.get("editor.options"));
+  // default option values
+  Object.assign(CM.defaults, {
+    mode: 'css',
+    lineNumbers: true,
+    lineWrapping: true,
+    foldGutter: true,
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter", "CodeMirror-lint-markers"],
+    matchBrackets: true,
+    highlightSelectionMatches: {showToken: /[#.\-\w]/, annotateScrollbar: true},
+    hintOptions: {},
+    lint: {getAnnotations: CodeMirror.lint.css, delay: prefs.get("editor.lintDelay")},
+    lintReportDelay: prefs.get("editor.lintReportDelay"),
+    styleActiveLine: true,
+    theme: "default",
+    keyMap: prefs.get("editor.keyMap"),
+    extraKeys: { // independent of current keyMap
+      "Alt-Enter": "toggleStyle",
+      "Alt-PageDown": "nextEditor",
+      "Alt-PageUp": "prevEditor"
+    }
+  }, prefs.get("editor.options"));
 
-	// additional commands
-	CM.commands.jumpToLine = jumpToLine;
-	CM.commands.nextEditor = function(cm) { nextPrevEditor(cm, 1) };
-	CM.commands.prevEditor = function(cm) { nextPrevEditor(cm, -1) };
-	CM.commands.save = save;
-	CM.commands.blockComment = function(cm) {
-		cm.blockComment(cm.getCursor("from"), cm.getCursor("to"), {fullLines: false});
-	};
-	CM.commands.toggleStyle = toggleStyle;
+  // additional commands
+  CM.commands.jumpToLine = jumpToLine;
+  CM.commands.nextEditor = function(cm) { nextPrevEditor(cm, 1) };
+  CM.commands.prevEditor = function(cm) { nextPrevEditor(cm, -1) };
+  CM.commands.save = save;
+  CM.commands.blockComment = function(cm) {
+    cm.blockComment(cm.getCursor("from"), cm.getCursor("to"), {fullLines: false});
+  };
+  CM.commands.toggleStyle = toggleStyle;
 
-	// "basic" keymap only has basic keys by design, so we skip it
+  // "basic" keymap only has basic keys by design, so we skip it
 
-	var extraKeysCommands = {};
-	Object.keys(CM.defaults.extraKeys).forEach(function(key) {
-		extraKeysCommands[CM.defaults.extraKeys[key]] = true;
-	});
-	if (!extraKeysCommands.jumpToLine) {
-		CM.keyMap.sublime["Ctrl-G"] = "jumpToLine";
-		CM.keyMap.emacsy["Ctrl-G"] = "jumpToLine";
-		CM.keyMap.pcDefault["Ctrl-J"] = "jumpToLine";
-		CM.keyMap.macDefault["Cmd-J"] = "jumpToLine";
-	}
-	if (!extraKeysCommands.autocomplete) {
-		CM.keyMap.pcDefault["Ctrl-Space"] = "autocomplete"; // will be used by "sublime" on PC via fallthrough
-		CM.keyMap.macDefault["Alt-Space"] = "autocomplete"; // OSX uses Ctrl-Space and Cmd-Space for something else
-		CM.keyMap.emacsy["Alt-/"] = "autocomplete"; // copied from "emacs" keymap
-		// "vim" and "emacs" define their own autocomplete hotkeys
-	}
-	if (!extraKeysCommands.blockComment) {
-		CM.keyMap.sublime["Shift-Ctrl-/"] = "blockComment";
-	}
+  var extraKeysCommands = {};
+  Object.keys(CM.defaults.extraKeys).forEach(function(key) {
+    extraKeysCommands[CM.defaults.extraKeys[key]] = true;
+  });
+  if (!extraKeysCommands.jumpToLine) {
+    CM.keyMap.sublime["Ctrl-G"] = "jumpToLine";
+    CM.keyMap.emacsy["Ctrl-G"] = "jumpToLine";
+    CM.keyMap.pcDefault["Ctrl-J"] = "jumpToLine";
+    CM.keyMap.macDefault["Cmd-J"] = "jumpToLine";
+  }
+  if (!extraKeysCommands.autocomplete) {
+    CM.keyMap.pcDefault["Ctrl-Space"] = "autocomplete"; // will be used by "sublime" on PC via fallthrough
+    CM.keyMap.macDefault["Alt-Space"] = "autocomplete"; // OSX uses Ctrl-Space and Cmd-Space for something else
+    CM.keyMap.emacsy["Alt-/"] = "autocomplete"; // copied from "emacs" keymap
+    // "vim" and "emacs" define their own autocomplete hotkeys
+  }
+  if (!extraKeysCommands.blockComment) {
+    CM.keyMap.sublime["Shift-Ctrl-/"] = "blockComment";
+  }
 
-	if (isWindowsOS) {
-		// "pcDefault" keymap on Windows should have F3/Shift-F3
-		if (!extraKeysCommands.findNext) {
-			CM.keyMap.pcDefault["F3"] = "findNext";
-		}
-		if (!extraKeysCommands.findPrev) {
-			CM.keyMap.pcDefault["Shift-F3"] = "findPrev";
-		}
+  if (isWindowsOS) {
+    // "pcDefault" keymap on Windows should have F3/Shift-F3
+    if (!extraKeysCommands.findNext) {
+      CM.keyMap.pcDefault["F3"] = "findNext";
+    }
+    if (!extraKeysCommands.findPrev) {
+      CM.keyMap.pcDefault["Shift-F3"] = "findPrev";
+    }
 
-		// try to remap non-interceptable Ctrl-(Shift-)N/T/W hotkeys
-		["N", "T", "W"].forEach(function(char) {
-			[{from: "Ctrl-", to: ["Alt-", "Ctrl-Alt-"]},
-			 {from: "Shift-Ctrl-", to: ["Ctrl-Alt-", "Shift-Ctrl-Alt-"]} // Note: modifier order in CM is S-C-A
-			].forEach(function(remap) {
-				var oldKey = remap.from + char;
-				Object.keys(CM.keyMap).forEach(function(keyMapName) {
-					var keyMap = CM.keyMap[keyMapName];
-					var command = keyMap[oldKey];
-					if (!command) {
-						return;
-					}
-					remap.to.some(function(newMod) {
-						var newKey = newMod + char;
-						if (!(newKey in keyMap)) {
-							delete keyMap[oldKey];
-							keyMap[newKey] = command;
-							return true;
-						}
-					});
-				});
-			});
-		});
-	}
+    // try to remap non-interceptable Ctrl-(Shift-)N/T/W hotkeys
+    ["N", "T", "W"].forEach(function(char) {
+      [{from: "Ctrl-", to: ["Alt-", "Ctrl-Alt-"]},
+       {from: "Shift-Ctrl-", to: ["Ctrl-Alt-", "Shift-Ctrl-Alt-"]} // Note: modifier order in CM is S-C-A
+      ].forEach(function(remap) {
+        var oldKey = remap.from + char;
+        Object.keys(CM.keyMap).forEach(function(keyMapName) {
+          var keyMap = CM.keyMap[keyMapName];
+          var command = keyMap[oldKey];
+          if (!command) {
+            return;
+          }
+          remap.to.some(function(newMod) {
+            var newKey = newMod + char;
+            if (!(newKey in keyMap)) {
+              delete keyMap[oldKey];
+              keyMap[newKey] = command;
+              return true;
+            }
+          });
+        });
+      });
+    });
+  }
 
-	// user option values
-	CM.getOption = function (o) {
-		return CodeMirror.defaults[o];
-	};
-	CM.setOption = function (o, v) {
-		CodeMirror.defaults[o] = v;
-		editors.forEach(function(editor) {
-			editor.setOption(o, v);
-		});
-	};
+  // user option values
+  CM.getOption = function (o) {
+    return CodeMirror.defaults[o];
+  };
+  CM.setOption = function (o, v) {
+    CodeMirror.defaults[o] = v;
+    editors.forEach(function(editor) {
+      editor.setOption(o, v);
+    });
+  };
 
-	CM.prototype.getSection = function() {
-		return this.display.wrapper.parentNode;
-	};
+  CM.prototype.getSection = function() {
+    return this.display.wrapper.parentNode;
+  };
 
-	// initialize global editor controls
-	function optionsHtmlFromArray(options) {
-		return options.map(function(opt) { return "<option>" + opt + "</option>"; }).join("");
-	}
-	var themeControl = document.getElementById("editor.theme");
-	const themeList = localStorage.codeMirrorThemes;
-	if (themeList) {
-		themeControl.innerHTML = optionsHtmlFromArray(themeList.split(/\s+/));
-	} else {
-		// Chrome is starting up and shows our edit.html, but the background page isn't loaded yet
-		const theme = prefs.get("editor.theme");
-		themeControl.innerHTML = optionsHtmlFromArray([theme == "default" ? t("defaultTheme") : theme]);
-		getCodeMirrorThemes().then(() => {
-			const themes = (localStorage.codeMirrorThemes || '').split(/\s+/);
-			themeControl.innerHTML = optionsHtmlFromArray(themes);
-			themeControl.selectedIndex = Math.max(0, themes.indexOf(theme));
-		});
-	}
-	document.getElementById("editor.keyMap").innerHTML = optionsHtmlFromArray(Object.keys(CM.keyMap).sort());
-	document.getElementById("options").addEventListener("change", acmeEventListener, false);
-	setupLivePrefs();
+  // initialize global editor controls
+  function optionsHtmlFromArray(options) {
+    return options.map(function(opt) { return "<option>" + opt + "</option>"; }).join("");
+  }
+  var themeControl = document.getElementById("editor.theme");
+  const themeList = localStorage.codeMirrorThemes;
+  if (themeList) {
+    themeControl.innerHTML = optionsHtmlFromArray(themeList.split(/\s+/));
+  } else {
+    // Chrome is starting up and shows our edit.html, but the background page isn't loaded yet
+    const theme = prefs.get("editor.theme");
+    themeControl.innerHTML = optionsHtmlFromArray([theme == "default" ? t("defaultTheme") : theme]);
+    getCodeMirrorThemes().then(() => {
+      const themes = (localStorage.codeMirrorThemes || '').split(/\s+/);
+      themeControl.innerHTML = optionsHtmlFromArray(themes);
+      themeControl.selectedIndex = Math.max(0, themes.indexOf(theme));
+    });
+  }
+  document.getElementById("editor.keyMap").innerHTML = optionsHtmlFromArray(Object.keys(CM.keyMap).sort());
+  document.getElementById("options").addEventListener("change", acmeEventListener, false);
+  setupLivePrefs();
 
-	hotkeyRerouter.setState(true);
+  hotkeyRerouter.setState(true);
 }
 
 function acmeEventListener(event) {
-	var el = event.target;
-	var option = el.id.replace(/^editor\./, '');
-	//console.log("acmeEventListener heard %s on %s", event.type, el.id);
-	if (!option) {
-		console.error("acmeEventListener: no 'cm_option' %O", el);
-		return;
-	}
-	var value = el.type == "checkbox" ? el.checked : el.value;
-	switch (option) {
-		case "tabSize":
-			CodeMirror.setOption("indentUnit", Number(value));
-			break;
-		case "theme":
-			var themeLink = document.getElementById("cm-theme");
-			// use non-localized "default" internally
-			if (!value || value == "default" || value == t("defaultTheme")) {
-				value = "default";
-				if (prefs.get(el.id) != value) {
-					prefs.set(el.id, value);
-				}
-				themeLink.href = "";
-				el.selectedIndex = 0;
-				break;
-			}
-			var url = chrome.runtime.getURL("vendor/codemirror/theme/" + value + ".css");
-			if (themeLink.href == url) { // preloaded in initCodeMirror()
-				break;
-			}
-			// avoid flicker: wait for the second stylesheet to load, then apply the theme
-			document.head.insertAdjacentHTML("beforeend",
-				'<link id="cm-theme2" rel="stylesheet" href="' + url + '">');
-			(function() {
-				setTimeout(function() {
-					CodeMirror.setOption(option, value);
-					themeLink.remove();
-					document.getElementById("cm-theme2").id = "cm-theme";
-				}, 100);
-			})();
-			return;
-		case 'autocompleteOnTyping':
-			editors.forEach(cm => {
-				const onOff = el.checked ? 'on' : 'off';
-				cm[onOff]('change', autocompleteOnTyping);
-				cm[onOff]('pick', autocompletePicked);
-			});
-			return;
-		case "matchHighlight":
-			switch (value) {
-				case 'token':
-				case 'selection':
-					document.body.dataset[option] = value;
-					value = {showToken: value == 'token' && /[#.\-\w]/, annotateScrollbar: true};
-					break;
-				default:
-					value = null;
-			}
-	}
-	CodeMirror.setOption(option, value);
+  var el = event.target;
+  var option = el.id.replace(/^editor\./, '');
+  //console.log("acmeEventListener heard %s on %s", event.type, el.id);
+  if (!option) {
+    console.error("acmeEventListener: no 'cm_option' %O", el);
+    return;
+  }
+  var value = el.type == "checkbox" ? el.checked : el.value;
+  switch (option) {
+    case "tabSize":
+      CodeMirror.setOption("indentUnit", Number(value));
+      break;
+    case "theme":
+      var themeLink = document.getElementById("cm-theme");
+      // use non-localized "default" internally
+      if (!value || value == "default" || value == t("defaultTheme")) {
+        value = "default";
+        if (prefs.get(el.id) != value) {
+          prefs.set(el.id, value);
+        }
+        themeLink.href = "";
+        el.selectedIndex = 0;
+        break;
+      }
+      var url = chrome.runtime.getURL("vendor/codemirror/theme/" + value + ".css");
+      if (themeLink.href == url) { // preloaded in initCodeMirror()
+        break;
+      }
+      // avoid flicker: wait for the second stylesheet to load, then apply the theme
+      document.head.insertAdjacentHTML("beforeend",
+        '<link id="cm-theme2" rel="stylesheet" href="' + url + '">');
+      (function() {
+        setTimeout(function() {
+          CodeMirror.setOption(option, value);
+          themeLink.remove();
+          document.getElementById("cm-theme2").id = "cm-theme";
+        }, 100);
+      })();
+      return;
+    case 'autocompleteOnTyping':
+      editors.forEach(cm => {
+        const onOff = el.checked ? 'on' : 'off';
+        cm[onOff]('change', autocompleteOnTyping);
+        cm[onOff]('pick', autocompletePicked);
+      });
+      return;
+    case "matchHighlight":
+      switch (value) {
+        case 'token':
+        case 'selection':
+          document.body.dataset[option] = value;
+          value = {showToken: value == 'token' && /[#.\-\w]/, annotateScrollbar: true};
+          break;
+        default:
+          value = null;
+      }
+  }
+  CodeMirror.setOption(option, value);
 }
 
 // replace given textarea with the CodeMirror editor
 function setupCodeMirror(textarea, index) {
-	const cm = CodeMirror.fromTextArea(textarea, {lint: null});
-	const wrapper = cm.display.wrapper;
+  const cm = CodeMirror.fromTextArea(textarea, {lint: null});
+  const wrapper = cm.display.wrapper;
 
-	cm.on('change', indicateCodeChange);
-	if (prefs.get('editor.autocompleteOnTyping')) {
-		cm.on('change', autocompleteOnTyping);
-		cm.on('pick', autocompletePicked);
-	}
-	cm.on('blur', () => {
-		editors.lastActive = cm;
-		hotkeyRerouter.setState(true);
-		setTimeout(() => {
-			wrapper.classList.toggle('CodeMirror-active', wrapper.contains(document.activeElement));
-		});
-	});
-	cm.on('focus', () => {
-		hotkeyRerouter.setState(false);
-		wrapper.classList.add('CodeMirror-active');
-	});
-	cm.on('mousedown', (cm, event) => toggleContextMenuDelete.call(cm, event));
+  cm.on('change', indicateCodeChange);
+  if (prefs.get('editor.autocompleteOnTyping')) {
+    cm.on('change', autocompleteOnTyping);
+    cm.on('pick', autocompletePicked);
+  }
+  cm.on('blur', () => {
+    editors.lastActive = cm;
+    hotkeyRerouter.setState(true);
+    setTimeout(() => {
+      wrapper.classList.toggle('CodeMirror-active', wrapper.contains(document.activeElement));
+    });
+  });
+  cm.on('focus', () => {
+    hotkeyRerouter.setState(false);
+    wrapper.classList.add('CodeMirror-active');
+  });
+  cm.on('mousedown', (cm, event) => toggleContextMenuDelete.call(cm, event));
 
-	let lastClickTime = 0;
-	const resizeGrip = wrapper.appendChild(template.resizeGrip.cloneNode(true));
-	resizeGrip.onmousedown = event => {
-		if (event.button != 0) {
-			return;
-		}
-		event.preventDefault();
-		if (Date.now() - lastClickTime < 500) {
-			lastClickTime = 0;
-			toggleSectionHeight(cm);
-			return;
-		}
-		lastClickTime = Date.now();
-		const minHeight = cm.defaultTextHeight()
-			+ cm.display.lineDiv.offsetParent.offsetTop /* .CodeMirror-lines padding */
-			+ wrapper.offsetHeight - wrapper.clientHeight /* borders */;
-		wrapper.style.pointerEvents = 'none';
-		document.body.style.cursor = 's-resize';
-		function resize(e) {
-			const cmPageY = wrapper.getBoundingClientRect().top + window.scrollY;
-			const height = Math.max(minHeight, e.pageY - cmPageY);
-			if (height != wrapper.clientHeight) {
-				cm.setSize(null, height);
-			}
-		}
-		document.addEventListener('mousemove', resize);
-		document.addEventListener('mouseup', function resizeStop() {
-			document.removeEventListener('mouseup', resizeStop);
-			document.removeEventListener('mousemove', resize);
-			wrapper.style.pointerEvents = '';
-			document.body.style.cursor = '';
-		});
-	};
+  let lastClickTime = 0;
+  const resizeGrip = wrapper.appendChild(template.resizeGrip.cloneNode(true));
+  resizeGrip.onmousedown = event => {
+    if (event.button != 0) {
+      return;
+    }
+    event.preventDefault();
+    if (Date.now() - lastClickTime < 500) {
+      lastClickTime = 0;
+      toggleSectionHeight(cm);
+      return;
+    }
+    lastClickTime = Date.now();
+    const minHeight = cm.defaultTextHeight()
+      + cm.display.lineDiv.offsetParent.offsetTop /* .CodeMirror-lines padding */
+      + wrapper.offsetHeight - wrapper.clientHeight /* borders */;
+    wrapper.style.pointerEvents = 'none';
+    document.body.style.cursor = 's-resize';
+    function resize(e) {
+      const cmPageY = wrapper.getBoundingClientRect().top + window.scrollY;
+      const height = Math.max(minHeight, e.pageY - cmPageY);
+      if (height != wrapper.clientHeight) {
+        cm.setSize(null, height);
+      }
+    }
+    document.addEventListener('mousemove', resize);
+    document.addEventListener('mouseup', function resizeStop() {
+      document.removeEventListener('mouseup', resizeStop);
+      document.removeEventListener('mousemove', resize);
+      wrapper.style.pointerEvents = '';
+      document.body.style.cursor = '';
+    });
+  };
 
-	editors.splice(index || editors.length, 0, cm);
-	return cm;
+  editors.splice(index || editors.length, 0, cm);
+  return cm;
 }
 
 function indicateCodeChange(cm) {
-	var section = cm.getSection();
-	setCleanItem(section, cm.isClean(section.savedValue));
-	updateTitle();
-	updateLintReport(cm);
+  var section = cm.getSection();
+  setCleanItem(section, cm.isClean(section.savedValue));
+  updateTitle();
+  updateLintReport(cm);
 }
 
 function getSectionForChild(e) {
-	return e.closest("#sections > div");
+  return e.closest("#sections > div");
 }
 
 function getSections() {
-	return document.querySelectorAll("#sections > div");
+  return document.querySelectorAll("#sections > div");
 }
 
 // remind Chrome to repaint a previously invisible editor box by toggling any element's transform
 // this bug is present in some versions of Chrome (v37-40 or something)
 document.addEventListener("scroll", function(event) {
-	var style = document.getElementById("name").style;
-	style.webkitTransform = style.webkitTransform ? "" : "scale(1)";
+  var style = document.getElementById("name").style;
+  style.webkitTransform = style.webkitTransform ? "" : "scale(1)";
 });
 
 // Shift-Ctrl-Wheel scrolls entire page even when mouse is over a code editor
 document.addEventListener("wheel", function(event) {
-	if (event.shiftKey && event.ctrlKey && !event.altKey && !event.metaKey) {
-		// Chrome scrolls horizontally when Shift is pressed but on some PCs this might be different
-		window.scrollBy(0, event.deltaX || event.deltaY);
-		event.preventDefault();
-	}
+  if (event.shiftKey && event.ctrlKey && !event.altKey && !event.metaKey) {
+    // Chrome scrolls horizontally when Shift is pressed but on some PCs this might be different
+    window.scrollBy(0, event.deltaX || event.deltaY);
+    event.preventDefault();
+  }
 });
 
 queryTabs({currentWindow: true}).then(tabs => {
-	var windowId = tabs[0].windowId;
-	if (prefs.get("openEditInWindow")) {
-		if (sessionStorage.saveSizeOnClose
-		&& 'left' in prefs.get('windowPosition', {})
-		&& !isWindowMaximized()) {
-			// window was reopened via Ctrl-Shift-T etc.
-			chrome.windows.update(windowId, prefs.get('windowPosition'));
-		}
-		if (tabs.length == 1 && window.history.length == 1) {
-			chrome.windows.getAll(function(windows) {
-				if (windows.length > 1) {
-					sessionStorageHash("saveSizeOnClose").set(windowId, true);
-					saveSizeOnClose = true;
-				}
-			});
-		} else {
-			saveSizeOnClose = sessionStorageHash("saveSizeOnClose").value[windowId];
-		}
-	}
-	chrome.tabs.onRemoved.addListener(function(tabId, info) {
-		sessionStorageHash("manageStylesHistory").unset(tabId);
-		if (info.windowId == windowId && info.isWindowClosing) {
-			sessionStorageHash("saveSizeOnClose").unset(windowId);
-		}
-	});
+  var windowId = tabs[0].windowId;
+  if (prefs.get("openEditInWindow")) {
+    if (sessionStorage.saveSizeOnClose
+    && 'left' in prefs.get('windowPosition', {})
+    && !isWindowMaximized()) {
+      // window was reopened via Ctrl-Shift-T etc.
+      chrome.windows.update(windowId, prefs.get('windowPosition'));
+    }
+    if (tabs.length == 1 && window.history.length == 1) {
+      chrome.windows.getAll(function(windows) {
+        if (windows.length > 1) {
+          sessionStorageHash("saveSizeOnClose").set(windowId, true);
+          saveSizeOnClose = true;
+        }
+      });
+    } else {
+      saveSizeOnClose = sessionStorageHash("saveSizeOnClose").value[windowId];
+    }
+  }
+  chrome.tabs.onRemoved.addListener(function(tabId, info) {
+    sessionStorageHash("manageStylesHistory").unset(tabId);
+    if (info.windowId == windowId && info.isWindowClosing) {
+      sessionStorageHash("saveSizeOnClose").unset(windowId);
+    }
+  });
 });
 
 getActiveTab().then(tab => {
-	useHistoryBack = sessionStorageHash("manageStylesHistory").value[tab.id] == location.href;
+  useHistoryBack = sessionStorageHash("manageStylesHistory").value[tab.id] == location.href;
 });
 
 function goBackToManage(event) {
-	if (useHistoryBack) {
-		event.stopPropagation();
-		event.preventDefault();
-		history.back();
-	} else if (styleId) {
-		sessionStorage.justEditedStyleId = styleId;
-	}
+  if (useHistoryBack) {
+    event.stopPropagation();
+    event.preventDefault();
+    history.back();
+  } else if (styleId) {
+    sessionStorage.justEditedStyleId = styleId;
+  }
 }
 
 function isWindowMaximized() {
-	return window.screenLeft == 0
-		&& window.screenTop == 0
-		&& window.outerWidth == screen.availWidth
-		&& window.outerHeight == screen.availHeight;
+  return window.screenLeft == 0
+    && window.screenTop == 0
+    && window.outerWidth == screen.availWidth
+    && window.outerHeight == screen.availHeight;
 }
 
 window.onbeforeunload = function() {
-	if (saveSizeOnClose	&& !isWindowMaximized()) {
-		prefs.set("windowPosition", {
-			left: screenLeft,
-			top: screenTop,
-			width: outerWidth,
-			height: outerHeight
-		});
-	}
-	document.activeElement.blur();
-	if (isCleanGlobal()) {
-		return;
-	}
-	updateLintReport(null, 0);
-	return confirm(t('styleChangesNotSaved'));
+  if (saveSizeOnClose	&& !isWindowMaximized()) {
+    prefs.set("windowPosition", {
+      left: screenLeft,
+      top: screenTop,
+      width: outerWidth,
+      height: outerHeight
+    });
+  }
+  document.activeElement.blur();
+  if (isCleanGlobal()) {
+    return;
+  }
+  updateLintReport(null, 0);
+  return confirm(t('styleChangesNotSaved'));
 };
 
 function addAppliesTo(list, name, value) {
-	var showingEverything = list.querySelector(".applies-to-everything") != null;
-	// blow away "Everything" if it's there
-	if (showingEverything) {
-		list.removeChild(list.firstChild);
-	}
-	var e;
-	if (name && value) {
-		e = template.appliesTo.cloneNode(true);
-		e.querySelector("[name=applies-type]").value = name;
-		e.querySelector("[name=applies-value]").value = value;
-		e.querySelector(".remove-applies-to").addEventListener("click", removeAppliesTo, false);
-	} else if (showingEverything || list.hasChildNodes()) {
-		e = template.appliesTo.cloneNode(true);
-		if (list.hasChildNodes()) {
-			e.querySelector("[name=applies-type]").value = list.querySelector("li:last-child [name='applies-type']").value;
-		}
-		e.querySelector(".remove-applies-to").addEventListener("click", removeAppliesTo, false);
-	} else {
-		e = template.appliesToEverything.cloneNode(true);
-	}
-	e.querySelector(".add-applies-to").addEventListener("click", function() {addAppliesTo(this.parentNode.parentNode)}, false);
-	list.appendChild(e);
+  var showingEverything = list.querySelector(".applies-to-everything") != null;
+  // blow away "Everything" if it's there
+  if (showingEverything) {
+    list.removeChild(list.firstChild);
+  }
+  var e;
+  if (name && value) {
+    e = template.appliesTo.cloneNode(true);
+    e.querySelector("[name=applies-type]").value = name;
+    e.querySelector("[name=applies-value]").value = value;
+    e.querySelector(".remove-applies-to").addEventListener("click", removeAppliesTo, false);
+  } else if (showingEverything || list.hasChildNodes()) {
+    e = template.appliesTo.cloneNode(true);
+    if (list.hasChildNodes()) {
+      e.querySelector("[name=applies-type]").value = list.querySelector("li:last-child [name='applies-type']").value;
+    }
+    e.querySelector(".remove-applies-to").addEventListener("click", removeAppliesTo, false);
+  } else {
+    e = template.appliesToEverything.cloneNode(true);
+  }
+  e.querySelector(".add-applies-to").addEventListener("click", function() {addAppliesTo(this.parentNode.parentNode)}, false);
+  list.appendChild(e);
 }
 
 function addSection(event, section) {
-	var div = template.section.cloneNode(true);
-	div.querySelector(".applies-to-help").addEventListener("click", showAppliesToHelp, false);
-	div.querySelector(".remove-section").addEventListener("click", removeSection, false);
-	div.querySelector(".add-section").addEventListener("click", addSection, false);
-	div.querySelector(".beautify-section").addEventListener("click", beautify);
+  var div = template.section.cloneNode(true);
+  div.querySelector(".applies-to-help").addEventListener("click", showAppliesToHelp, false);
+  div.querySelector(".remove-section").addEventListener("click", removeSection, false);
+  div.querySelector(".add-section").addEventListener("click", addSection, false);
+  div.querySelector(".beautify-section").addEventListener("click", beautify);
 
-	var codeElement = div.querySelector(".code");
-	var appliesTo = div.querySelector(".applies-to-list");
-	var appliesToAdded = false;
+  var codeElement = div.querySelector(".code");
+  var appliesTo = div.querySelector(".applies-to-list");
+  var appliesToAdded = false;
 
-	if (section) {
-		codeElement.value = section.code;
-		for (var i in propertyToCss) {
-			if (section[i]) {
-				section[i].forEach(function(url) {
-					addAppliesTo(appliesTo, propertyToCss[i], url);
-					appliesToAdded = true;
-				});
-			}
-		}
-	}
-	if (!appliesToAdded) {
-		addAppliesTo(appliesTo);
-	}
+  if (section) {
+    codeElement.value = section.code;
+    for (var i in propertyToCss) {
+      if (section[i]) {
+        section[i].forEach(function(url) {
+          addAppliesTo(appliesTo, propertyToCss[i], url);
+          appliesToAdded = true;
+        });
+      }
+    }
+  }
+  if (!appliesToAdded) {
+    addAppliesTo(appliesTo);
+  }
 
-	appliesTo.addEventListener("change", onChange);
-	appliesTo.addEventListener("input", onChange);
+  appliesTo.addEventListener("change", onChange);
+  appliesTo.addEventListener("input", onChange);
 
-	toggleTestRegExpVisibility();
-	appliesTo.addEventListener('change', toggleTestRegExpVisibility);
-	div.querySelector('.test-regexp').onclick = showRegExpTester;
-	function toggleTestRegExpVisibility() {
-		const show = [...appliesTo.children].some(item =>
-			!item.matches('.applies-to-everything') &&
-			item.querySelector('.applies-type').value == 'regexp' &&
-			item.querySelector('.applies-value').value.trim());
-		div.classList.toggle('has-regexp', show);
-		appliesTo.oninput = appliesTo.oninput || show && (event => {
-			if (event.target.matches('.applies-value')
-			&& event.target.parentElement.querySelector('.applies-type').value == 'regexp') {
-				showRegExpTester(null, div);
-			}
-		});
-	}
+  toggleTestRegExpVisibility();
+  appliesTo.addEventListener('change', toggleTestRegExpVisibility);
+  div.querySelector('.test-regexp').onclick = showRegExpTester;
+  function toggleTestRegExpVisibility() {
+    const show = [...appliesTo.children].some(item =>
+      !item.matches('.applies-to-everything') &&
+      item.querySelector('.applies-type').value == 'regexp' &&
+      item.querySelector('.applies-value').value.trim());
+    div.classList.toggle('has-regexp', show);
+    appliesTo.oninput = appliesTo.oninput || show && (event => {
+      if (event.target.matches('.applies-value')
+      && event.target.parentElement.querySelector('.applies-type').value == 'regexp') {
+        showRegExpTester(null, div);
+      }
+    });
+  }
 
-	var sections = document.getElementById("sections");
-	if (event) {
-		var clickedSection = getSectionForChild(event.target);
-		sections.insertBefore(div, clickedSection.nextElementSibling);
-		var newIndex = getSections().indexOf(clickedSection) + 1;
-		var cm = setupCodeMirror(codeElement, newIndex);
-		makeSectionVisible(cm);
-		cm.focus()
-		renderLintReport();
-	} else {
-		sections.appendChild(div);
-		var cm = setupCodeMirror(codeElement);
-	}
+  var sections = document.getElementById("sections");
+  if (event) {
+    var clickedSection = getSectionForChild(event.target);
+    sections.insertBefore(div, clickedSection.nextElementSibling);
+    var newIndex = getSections().indexOf(clickedSection) + 1;
+    var cm = setupCodeMirror(codeElement, newIndex);
+    makeSectionVisible(cm);
+    cm.focus()
+    renderLintReport();
+  } else {
+    sections.appendChild(div);
+    var cm = setupCodeMirror(codeElement);
+  }
 
-	div.CodeMirror = cm;
-	setCleanSection(div);
-	return div;
+  div.CodeMirror = cm;
+  setCleanSection(div);
+  return div;
 }
 
 function removeAppliesTo(event) {
-	var appliesTo = event.target.parentNode,
-	    appliesToList = appliesTo.parentNode;
-	removeAreaAndSetDirty(appliesTo);
-	if (!appliesToList.hasChildNodes()) {
-		addAppliesTo(appliesToList);
-	}
+  var appliesTo = event.target.parentNode,
+      appliesToList = appliesTo.parentNode;
+  removeAreaAndSetDirty(appliesTo);
+  if (!appliesToList.hasChildNodes()) {
+    addAppliesTo(appliesToList);
+  }
 }
 
 function removeSection(event) {
-	var section = getSectionForChild(event.target);
-	var cm = section.CodeMirror;
-	removeAreaAndSetDirty(section);
-	editors.splice(editors.indexOf(cm), 1);
-	renderLintReport();
+  var section = getSectionForChild(event.target);
+  var cm = section.CodeMirror;
+  removeAreaAndSetDirty(section);
+  editors.splice(editors.indexOf(cm), 1);
+  renderLintReport();
 }
 
 function removeAreaAndSetDirty(area) {
-	var contributors = area.querySelectorAll('.style-contributor');
-	if(!contributors.length){
-		setCleanItem(area, false);
-	}
-	contributors.some(function(node) {
-		if (node.savedValue) {
-			// it's a saved section, so make it dirty and stop the enumeration
-			setCleanItem(area, false);
-			return true;
-		} else {
-			// it's an empty section, so undirty the applies-to items,
-			// otherwise orphaned ids would keep the style dirty
-			setCleanItem(node, true);
-		}
-	});
-	updateTitle();
-	area.parentNode.removeChild(area);
+  var contributors = area.querySelectorAll('.style-contributor');
+  if(!contributors.length){
+    setCleanItem(area, false);
+  }
+  contributors.some(function(node) {
+    if (node.savedValue) {
+      // it's a saved section, so make it dirty and stop the enumeration
+      setCleanItem(area, false);
+      return true;
+    } else {
+      // it's an empty section, so undirty the applies-to items,
+      // otherwise orphaned ids would keep the style dirty
+      setCleanItem(node, true);
+    }
+  });
+  updateTitle();
+  area.parentNode.removeChild(area);
 }
 
 function makeSectionVisible(cm) {
-	var section = cm.getSection();
-	var bounds = section.getBoundingClientRect();
-	if ((bounds.bottom > window.innerHeight && bounds.top > 0) || (bounds.top < 0 && bounds.bottom < window.innerHeight)) {
-		if (bounds.top < 0) {
-			window.scrollBy(0, bounds.top - 1);
-		} else {
-			window.scrollBy(0, bounds.bottom - window.innerHeight + 1);
-		}
-	}
+  var section = cm.getSection();
+  var bounds = section.getBoundingClientRect();
+  if ((bounds.bottom > window.innerHeight && bounds.top > 0) || (bounds.top < 0 && bounds.bottom < window.innerHeight)) {
+    if (bounds.top < 0) {
+      window.scrollBy(0, bounds.top - 1);
+    } else {
+      window.scrollBy(0, bounds.bottom - window.innerHeight + 1);
+    }
+  }
 }
 
 function setupGlobalSearch() {
-	var originalCommand = {
-		find: CodeMirror.commands.find,
-		findNext: CodeMirror.commands.findNext,
-		findPrev: CodeMirror.commands.findPrev,
-		replace: CodeMirror.commands.replace
-	};
-	var originalOpenDialog = CodeMirror.prototype.openDialog;
-	var originalOpenConfirm = CodeMirror.prototype.openConfirm;
+  var originalCommand = {
+    find: CodeMirror.commands.find,
+    findNext: CodeMirror.commands.findNext,
+    findPrev: CodeMirror.commands.findPrev,
+    replace: CodeMirror.commands.replace
+  };
+  var originalOpenDialog = CodeMirror.prototype.openDialog;
+  var originalOpenConfirm = CodeMirror.prototype.openConfirm;
 
-	var curState; // cm.state.search for last used 'find'
+  var curState; // cm.state.search for last used 'find'
 
-	function shouldIgnoreCase(query) { // treat all-lowercase non-regexp queries as case-insensitive
-		return typeof query == "string" && query == query.toLowerCase();
-	}
+  function shouldIgnoreCase(query) { // treat all-lowercase non-regexp queries as case-insensitive
+    return typeof query == "string" && query == query.toLowerCase();
+  }
 
-	function updateState(cm, newState) {
-		if (!newState) {
-			if (cm.state.search) {
-				return cm.state.search;
-			}
-			if (!curState) {
-				return null;
-			}
-			newState = curState;
-		}
-		cm.state.search = {
-			query: newState.query,
-			overlay: newState.overlay,
-			annotate: cm.showMatchesOnScrollbar(newState.query, shouldIgnoreCase(newState.query))
-		}
-		cm.addOverlay(newState.overlay);
-		return cm.state.search;
-	}
+  function updateState(cm, newState) {
+    if (!newState) {
+      if (cm.state.search) {
+        return cm.state.search;
+      }
+      if (!curState) {
+        return null;
+      }
+      newState = curState;
+    }
+    cm.state.search = {
+      query: newState.query,
+      overlay: newState.overlay,
+      annotate: cm.showMatchesOnScrollbar(newState.query, shouldIgnoreCase(newState.query))
+    }
+    cm.addOverlay(newState.overlay);
+    return cm.state.search;
+  }
 
-	// temporarily overrides the original openDialog with the provided template's innerHTML
-	function customizeOpenDialog(cm, template, callback) {
-		cm.openDialog = function(tmpl, cb, opt) {
-			// invoke 'callback' and bind 'this' to the original callback
-			originalOpenDialog.call(cm, template.innerHTML, callback.bind(cb), opt);
-		};
-		setTimeout(function() { cm.openDialog = originalOpenDialog; }, 0);
-		refocusMinidialog(cm);
-	}
+  // temporarily overrides the original openDialog with the provided template's innerHTML
+  function customizeOpenDialog(cm, template, callback) {
+    cm.openDialog = function(tmpl, cb, opt) {
+      // invoke 'callback' and bind 'this' to the original callback
+      originalOpenDialog.call(cm, template.innerHTML, callback.bind(cb), opt);
+    };
+    setTimeout(function() { cm.openDialog = originalOpenDialog; }, 0);
+    refocusMinidialog(cm);
+  }
 
-	function focusClosestCM(activeCM) {
-		editors.lastActive = activeCM;
-		var cm = getEditorInSight();
-		if (cm != activeCM) {
-			cm.focus();
-		}
-		return cm;
+  function focusClosestCM(activeCM) {
+    editors.lastActive = activeCM;
+    var cm = getEditorInSight();
+    if (cm != activeCM) {
+      cm.focus();
+    }
+    return cm;
 
-	}
+  }
 
-	function find(activeCM) {
-		activeCM = focusClosestCM(activeCM);
-		customizeOpenDialog(activeCM, template.find, function(query) {
-			this(query);
-			curState = activeCM.state.search;
-			if (editors.length == 1 || !curState.query) {
-				return;
-			}
-			editors.forEach(function(cm) {
-				if (cm != activeCM) {
-					cm.execCommand("clearSearch");
-					updateState(cm, curState);
-				}
-			});
-			if (CodeMirror.cmpPos(curState.posFrom, curState.posTo) == 0) {
-				findNext(activeCM);
-			}
-		});
-		originalCommand.find(activeCM);
-	}
+  function find(activeCM) {
+    activeCM = focusClosestCM(activeCM);
+    customizeOpenDialog(activeCM, template.find, function(query) {
+      this(query);
+      curState = activeCM.state.search;
+      if (editors.length == 1 || !curState.query) {
+        return;
+      }
+      editors.forEach(function(cm) {
+        if (cm != activeCM) {
+          cm.execCommand("clearSearch");
+          updateState(cm, curState);
+        }
+      });
+      if (CodeMirror.cmpPos(curState.posFrom, curState.posTo) == 0) {
+        findNext(activeCM);
+      }
+    });
+    originalCommand.find(activeCM);
+  }
 
-	function findNext(activeCM, reverse) {
-		var state = updateState(activeCM);
-		if (!state || !state.query) {
-			find(activeCM);
-			return;
-		}
-		var pos = activeCM.getCursor(reverse ? "from" : "to");
-		activeCM.setSelection(activeCM.getCursor()); // clear the selection, don't move the cursor
+  function findNext(activeCM, reverse) {
+    var state = updateState(activeCM);
+    if (!state || !state.query) {
+      find(activeCM);
+      return;
+    }
+    var pos = activeCM.getCursor(reverse ? "from" : "to");
+    activeCM.setSelection(activeCM.getCursor()); // clear the selection, don't move the cursor
 
-		var rxQuery = typeof state.query == "object"
-			? state.query : stringAsRegExp(state.query, shouldIgnoreCase(state.query) ? "i" : "");
+    var rxQuery = typeof state.query == "object"
+      ? state.query : stringAsRegExp(state.query, shouldIgnoreCase(state.query) ? "i" : "");
 
-		if (document.activeElement && document.activeElement.name == "applies-value"
-			&& searchAppliesTo(activeCM)) {
-			return;
-		}
-		for (var i=0, cm=activeCM; i < editors.length; i++) {
-			state = updateState(cm);
-			if (!cm.hasFocus()) {
-				pos = reverse ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(0, 0);
-			}
-			var searchCursor = cm.getSearchCursor(state.query, pos, shouldIgnoreCase(state.query));
-			if (searchCursor.find(reverse)) {
-				if (editors.length > 1) {
-					makeSectionVisible(cm);
-					cm.focus();
-				}
-				// speedup the original findNext
-				state.posFrom = reverse ? searchCursor.to() : searchCursor.from();
-				state.posTo = CodeMirror.Pos(state.posFrom.line, state.posFrom.ch);
-				originalCommand[reverse ? "findPrev" : "findNext"](cm);
-				return;
-			} else if (!reverse && searchAppliesTo(cm)) {
-				return;
-			}
-			cm = editors[(editors.indexOf(cm) + (reverse ? -1 + editors.length : 1)) % editors.length];
-			if (reverse && searchAppliesTo(cm)) {
-				return;
-			}
-		}
-		// nothing found so far, so call the original search with wrap-around
-		originalCommand[reverse ? "findPrev" : "findNext"](activeCM);
+    if (document.activeElement && document.activeElement.name == "applies-value"
+      && searchAppliesTo(activeCM)) {
+      return;
+    }
+    for (var i=0, cm=activeCM; i < editors.length; i++) {
+      state = updateState(cm);
+      if (!cm.hasFocus()) {
+        pos = reverse ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(0, 0);
+      }
+      var searchCursor = cm.getSearchCursor(state.query, pos, shouldIgnoreCase(state.query));
+      if (searchCursor.find(reverse)) {
+        if (editors.length > 1) {
+          makeSectionVisible(cm);
+          cm.focus();
+        }
+        // speedup the original findNext
+        state.posFrom = reverse ? searchCursor.to() : searchCursor.from();
+        state.posTo = CodeMirror.Pos(state.posFrom.line, state.posFrom.ch);
+        originalCommand[reverse ? "findPrev" : "findNext"](cm);
+        return;
+      } else if (!reverse && searchAppliesTo(cm)) {
+        return;
+      }
+      cm = editors[(editors.indexOf(cm) + (reverse ? -1 + editors.length : 1)) % editors.length];
+      if (reverse && searchAppliesTo(cm)) {
+        return;
+      }
+    }
+    // nothing found so far, so call the original search with wrap-around
+    originalCommand[reverse ? "findPrev" : "findNext"](activeCM);
 
-		function searchAppliesTo(cm) {
-			var inputs = [].slice.call(cm.getSection().querySelectorAll(".applies-value"));
-			if (reverse) {
-				inputs = inputs.reverse();
-			}
-			inputs.splice(0, inputs.indexOf(document.activeElement) + 1);
-			return inputs.some(function(input) {
-				var match = rxQuery.exec(input.value);
-				if (match) {
-					input.focus();
-					var end = match.index + match[0].length;
-					// scroll selected part into view in long inputs,
-					// works only outside of current event handlers chain, hence timeout=0
-					setTimeout(function() {
-						input.setSelectionRange(end, end);
-						input.setSelectionRange(match.index, end)
-					}, 0);
-					return true;
-				}
-			});
-		}
-	}
+    function searchAppliesTo(cm) {
+      var inputs = [].slice.call(cm.getSection().querySelectorAll(".applies-value"));
+      if (reverse) {
+        inputs = inputs.reverse();
+      }
+      inputs.splice(0, inputs.indexOf(document.activeElement) + 1);
+      return inputs.some(function(input) {
+        var match = rxQuery.exec(input.value);
+        if (match) {
+          input.focus();
+          var end = match.index + match[0].length;
+          // scroll selected part into view in long inputs,
+          // works only outside of current event handlers chain, hence timeout=0
+          setTimeout(function() {
+            input.setSelectionRange(end, end);
+            input.setSelectionRange(match.index, end)
+          }, 0);
+          return true;
+        }
+      });
+    }
+  }
 
-	function findPrev(cm) {
-		findNext(cm, true);
-	}
+  function findPrev(cm) {
+    findNext(cm, true);
+  }
 
-	function replace(activeCM, all) {
-		var queue, query, replacement;
-		activeCM = focusClosestCM(activeCM);
-		customizeOpenDialog(activeCM, template[all ? "replaceAll" : "replace"], function(txt) {
-			query = txt;
-			customizeOpenDialog(activeCM, template.replaceWith, function(txt) {
-				replacement = txt;
-				queue = editors.rotate(-editors.indexOf(activeCM));
-				all ? editors.forEach(doReplace) : doReplace();
-			});
-			this(query);
-		});
-		originalCommand.replace(activeCM, all);
+  function replace(activeCM, all) {
+    var queue, query, replacement;
+    activeCM = focusClosestCM(activeCM);
+    customizeOpenDialog(activeCM, template[all ? "replaceAll" : "replace"], function(txt) {
+      query = txt;
+      customizeOpenDialog(activeCM, template.replaceWith, function(txt) {
+        replacement = txt;
+        queue = editors.rotate(-editors.indexOf(activeCM));
+        all ? editors.forEach(doReplace) : doReplace();
+      });
+      this(query);
+    });
+    originalCommand.replace(activeCM, all);
 
-		function doReplace() {
-			var cm = queue.shift();
-			if (!cm) {
-				if (!all) {
-					editors.lastActive.focus();
-				}
-				return;
-			}
-			// hide the first two dialogs (replace, replaceWith)
-			cm.openDialog = function(tmpl, callback, opt) {
-				cm.openDialog = function(tmpl, callback, opt) {
-					cm.openDialog = originalOpenDialog;
-					if (all) {
-						callback(replacement);
-					} else {
-						doConfirm(cm);
-						callback(replacement);
-						if (!cm.getWrapperElement().querySelector(".CodeMirror-dialog")) {
-							// no dialog == nothing found in the current CM, move to the next
-							doReplace();
-						}
-					}
-				};
-				callback(query);
-			};
-			originalCommand.replace(cm, all);
-		}
-		function doConfirm(cm) {
-			var wrapAround = false;
-			var origPos = cm.getCursor();
-			cm.openConfirm = function overrideConfirm(tmpl, callbacks, opt) {
-				var ovrCallbacks = callbacks.map(function(callback) {
-					return function() {
-						makeSectionVisible(cm);
-						cm.openConfirm = overrideConfirm;
-						setTimeout(function() { cm.openConfirm = originalOpenConfirm; }, 0);
+    function doReplace() {
+      var cm = queue.shift();
+      if (!cm) {
+        if (!all) {
+          editors.lastActive.focus();
+        }
+        return;
+      }
+      // hide the first two dialogs (replace, replaceWith)
+      cm.openDialog = function(tmpl, callback, opt) {
+        cm.openDialog = function(tmpl, callback, opt) {
+          cm.openDialog = originalOpenDialog;
+          if (all) {
+            callback(replacement);
+          } else {
+            doConfirm(cm);
+            callback(replacement);
+            if (!cm.getWrapperElement().querySelector(".CodeMirror-dialog")) {
+              // no dialog == nothing found in the current CM, move to the next
+              doReplace();
+            }
+          }
+        };
+        callback(query);
+      };
+      originalCommand.replace(cm, all);
+    }
+    function doConfirm(cm) {
+      var wrapAround = false;
+      var origPos = cm.getCursor();
+      cm.openConfirm = function overrideConfirm(tmpl, callbacks, opt) {
+        var ovrCallbacks = callbacks.map(function(callback) {
+          return function() {
+            makeSectionVisible(cm);
+            cm.openConfirm = overrideConfirm;
+            setTimeout(function() { cm.openConfirm = originalOpenConfirm; }, 0);
 
-						var pos = cm.getCursor();
-						callback();
-						var cmp = CodeMirror.cmpPos(cm.getCursor(), pos);
-						wrapAround |= cmp <= 0;
+            var pos = cm.getCursor();
+            callback();
+            var cmp = CodeMirror.cmpPos(cm.getCursor(), pos);
+            wrapAround |= cmp <= 0;
 
-						var dlg = cm.getWrapperElement().querySelector(".CodeMirror-dialog");
-						if (!dlg || cmp == 0 || wrapAround && CodeMirror.cmpPos(cm.getCursor(), origPos) >= 0) {
-							if (dlg) {
-								dlg.remove();
-							}
-							doReplace();
-						}
-					}
-				});
-				originalOpenConfirm.call(cm, template.replaceConfirm.innerHTML, ovrCallbacks, opt);
-			};
-		}
-	}
+            var dlg = cm.getWrapperElement().querySelector(".CodeMirror-dialog");
+            if (!dlg || cmp == 0 || wrapAround && CodeMirror.cmpPos(cm.getCursor(), origPos) >= 0) {
+              if (dlg) {
+                dlg.remove();
+              }
+              doReplace();
+            }
+          }
+        });
+        originalOpenConfirm.call(cm, template.replaceConfirm.innerHTML, ovrCallbacks, opt);
+      };
+    }
+  }
 
-	function replaceAll(cm) {
-		replace(cm, true);
-	}
+  function replaceAll(cm) {
+    replace(cm, true);
+  }
 
-	CodeMirror.commands.find = find;
-	CodeMirror.commands.findNext = findNext;
-	CodeMirror.commands.findPrev = findPrev;
-	CodeMirror.commands.replace = replace;
-	CodeMirror.commands.replaceAll = replaceAll;
+  CodeMirror.commands.find = find;
+  CodeMirror.commands.findNext = findNext;
+  CodeMirror.commands.findPrev = findPrev;
+  CodeMirror.commands.replace = replace;
+  CodeMirror.commands.replaceAll = replaceAll;
 }
 
 function jumpToLine(cm) {
-	var cur = cm.getCursor();
-	refocusMinidialog(cm);
-	cm.openDialog(template.jumpToLine.innerHTML, function(str) {
-		var m = str.match(/^\s*(\d+)(?:\s*:\s*(\d+))?\s*$/);
-		if (m) {
-			cm.setCursor(m[1] - 1, m[2] ? m[2] - 1 : cur.ch);
-		}
-	}, {value: cur.line+1});
+  var cur = cm.getCursor();
+  refocusMinidialog(cm);
+  cm.openDialog(template.jumpToLine.innerHTML, function(str) {
+    var m = str.match(/^\s*(\d+)(?:\s*:\s*(\d+))?\s*$/);
+    if (m) {
+      cm.setCursor(m[1] - 1, m[2] ? m[2] - 1 : cur.ch);
+    }
+  }, {value: cur.line+1});
 }
 
 function toggleStyle() {
-	$('#enabled').checked = !$('#enabled').checked;
-	save();
+  $('#enabled').checked = !$('#enabled').checked;
+  save();
 }
 
 function toggleSectionHeight(cm) {
-	if (cm.state.toggleHeightSaved) {
-		// restore previous size
-		cm.setSize(null, cm.state.toggleHeightSaved);
-		cm.state.toggleHeightSaved = 0;
-	} else {
-		// maximize
-		const wrapper = cm.display.wrapper;
-		const allBounds = $('#sections').getBoundingClientRect();
-		const pageExtrasHeight = allBounds.top + window.scrollY +
-			parseFloat(getComputedStyle($('#sections')).paddingBottom);
-		const sectionExtrasHeight = cm.getSection().clientHeight - wrapper.offsetHeight;
-		cm.state.toggleHeightSaved = wrapper.clientHeight;
-		cm.setSize(null, window.innerHeight - sectionExtrasHeight - pageExtrasHeight);
-		const bounds = cm.getSection().getBoundingClientRect();
-		if (bounds.top < 0 || bounds.bottom > window.innerHeight) {
-			window.scrollBy(0, bounds.top);
-		}
-	}
+  if (cm.state.toggleHeightSaved) {
+    // restore previous size
+    cm.setSize(null, cm.state.toggleHeightSaved);
+    cm.state.toggleHeightSaved = 0;
+  } else {
+    // maximize
+    const wrapper = cm.display.wrapper;
+    const allBounds = $('#sections').getBoundingClientRect();
+    const pageExtrasHeight = allBounds.top + window.scrollY +
+      parseFloat(getComputedStyle($('#sections')).paddingBottom);
+    const sectionExtrasHeight = cm.getSection().clientHeight - wrapper.offsetHeight;
+    cm.state.toggleHeightSaved = wrapper.clientHeight;
+    cm.setSize(null, window.innerHeight - sectionExtrasHeight - pageExtrasHeight);
+    const bounds = cm.getSection().getBoundingClientRect();
+    if (bounds.top < 0 || bounds.bottom > window.innerHeight) {
+      window.scrollBy(0, bounds.top);
+    }
+  }
 }
 
 function autocompleteOnTyping(cm, info, debounced) {
-	if (cm.state.completionActive
-	|| info.origin && !info.origin.includes('input')
-	|| !info.text.last) {
-		return;
-	}
-	if (cm.state.autocompletePicked) {
-		cm.state.autocompletePicked = false;
-		return;
-	}
-	if (!debounced) {
-		debounce(autocompleteOnTyping, 100, cm, info, true);
-		return;
-	}
-	if (info.text.last.match(/[-\w!]+$/)) {
-		cm.state.autocompletePicked = false;
-		cm.options.hintOptions.completeSingle = false;
-		cm.execCommand('autocomplete');
-		setTimeout(() => {
-			cm.options.hintOptions.completeSingle = true;
-		});
-	}
+  if (cm.state.completionActive
+  || info.origin && !info.origin.includes('input')
+  || !info.text.last) {
+    return;
+  }
+  if (cm.state.autocompletePicked) {
+    cm.state.autocompletePicked = false;
+    return;
+  }
+  if (!debounced) {
+    debounce(autocompleteOnTyping, 100, cm, info, true);
+    return;
+  }
+  if (info.text.last.match(/[-\w!]+$/)) {
+    cm.state.autocompletePicked = false;
+    cm.options.hintOptions.completeSingle = false;
+    cm.execCommand('autocomplete');
+    setTimeout(() => {
+      cm.options.hintOptions.completeSingle = true;
+    });
+  }
 }
 
 function autocompletePicked(cm) {
-	cm.state.autocompletePicked = true;
+  cm.state.autocompletePicked = true;
 }
 
 function refocusMinidialog(cm) {
-	var section = cm.getSection();
-	if (!section.querySelector(".CodeMirror-dialog")) {
-		return;
-	}
-	// close the currently opened minidialog
-	cm.focus();
-	// make sure to focus the input in newly opened minidialog
-	setTimeout(function() {
-		section.querySelector(".CodeMirror-dialog").focus();
-	}, 0);
+  var section = cm.getSection();
+  if (!section.querySelector(".CodeMirror-dialog")) {
+    return;
+  }
+  // close the currently opened minidialog
+  cm.focus();
+  // make sure to focus the input in newly opened minidialog
+  setTimeout(function() {
+    section.querySelector(".CodeMirror-dialog").focus();
+  }, 0);
 }
 
 function nextPrevEditor(cm, direction) {
-	cm = editors[(editors.indexOf(cm) + direction + editors.length) % editors.length];
-	makeSectionVisible(cm);
-	cm.focus();
+  cm = editors[(editors.indexOf(cm) + direction + editors.length) % editors.length];
+  makeSectionVisible(cm);
+  cm.focus();
 }
 
 function getEditorInSight(nearbyElement) {
-	// priority: 1. associated CM for applies-to element 2. last active if visible 3. first visible
-	var cm;
-	if (nearbyElement && nearbyElement.className.indexOf("applies-") >= 0) {
-		cm = getSectionForChild(nearbyElement).CodeMirror;
-	} else {
-		cm = editors.lastActive;
-	}
-	if (!cm || offscreenDistance(cm) > 0) {
-		var sorted = editors
-			.map(function(cm, index) { return {cm: cm, distance: offscreenDistance(cm), index: index} })
-			.sort(function(a, b) { return a.distance - b.distance || a.index - b.index });
-		cm = sorted[0].cm;
-		if (sorted[0].distance > 0) {
-			makeSectionVisible(cm)
-		}
-	}
-	return cm;
+  // priority: 1. associated CM for applies-to element 2. last active if visible 3. first visible
+  var cm;
+  if (nearbyElement && nearbyElement.className.indexOf("applies-") >= 0) {
+    cm = getSectionForChild(nearbyElement).CodeMirror;
+  } else {
+    cm = editors.lastActive;
+  }
+  if (!cm || offscreenDistance(cm) > 0) {
+    var sorted = editors
+      .map(function(cm, index) { return {cm: cm, distance: offscreenDistance(cm), index: index} })
+      .sort(function(a, b) { return a.distance - b.distance || a.index - b.index });
+    cm = sorted[0].cm;
+    if (sorted[0].distance > 0) {
+      makeSectionVisible(cm)
+    }
+  }
+  return cm;
 
-	function offscreenDistance(cm) {
-		var LINES_VISIBLE = 2; // closest editor should have at least # lines visible
-		var bounds = cm.getSection().getBoundingClientRect();
-		if (bounds.top < 0) {
-			return -bounds.top;
-		} else if (bounds.top < window.innerHeight - cm.defaultTextHeight() * LINES_VISIBLE) {
-			return 0;
-		} else {
-			return bounds.top - bounds.height;
-		}
-	}
+  function offscreenDistance(cm) {
+    var LINES_VISIBLE = 2; // closest editor should have at least # lines visible
+    var bounds = cm.getSection().getBoundingClientRect();
+    if (bounds.top < 0) {
+      return -bounds.top;
+    } else if (bounds.top < window.innerHeight - cm.defaultTextHeight() * LINES_VISIBLE) {
+      return 0;
+    } else {
+      return bounds.top - bounds.height;
+    }
+  }
 }
 
 function updateLintReport(cm, delay) {
-	if (delay == 0) {
-		// immediately show pending csslint messages in onbeforeunload and save
-		update(cm);
-		return;
-	}
-	if (delay > 0) {
-		setTimeout(cm => { cm.performLint(); update(cm) }, delay, cm);
-		return;
-	}
-	var state = cm.state.lint;
-	if (!state) {
-		return;
-	}
-	// user is editing right now: postpone updating the report for the new issues (default: 500ms lint + 4500ms)
-	// or update it as soon as possible (default: 500ms lint + 100ms) in case an existing issue was just fixed
-	clearTimeout(state.reportTimeout);
-	state.reportTimeout = setTimeout(update, state.options.delay + 100, cm);
-	state.postponeNewIssues = delay == undefined || delay == null;
+  if (delay == 0) {
+    // immediately show pending csslint messages in onbeforeunload and save
+    update(cm);
+    return;
+  }
+  if (delay > 0) {
+    setTimeout(cm => { cm.performLint(); update(cm) }, delay, cm);
+    return;
+  }
+  var state = cm.state.lint;
+  if (!state) {
+    return;
+  }
+  // user is editing right now: postpone updating the report for the new issues (default: 500ms lint + 4500ms)
+  // or update it as soon as possible (default: 500ms lint + 100ms) in case an existing issue was just fixed
+  clearTimeout(state.reportTimeout);
+  state.reportTimeout = setTimeout(update, state.options.delay + 100, cm);
+  state.postponeNewIssues = delay == undefined || delay == null;
 
-	function update(cm) {
-		var scope = cm ? [cm] : editors;
-		var changed = false;
-		var fixedOldIssues = false;
-		scope.forEach(function(cm) {
-			var state = cm.state.lint || {};
-			var oldMarkers = state.markedLast || {};
-			var newMarkers = {};
-			var html = !state.marked || state.marked.length == 0 ? "" : "<tbody>" +
-				state.marked.map(function(mark) {
-					var info = mark.__annotation;
-					var isActiveLine = info.from.line == cm.getCursor().line;
-					var pos = isActiveLine ? "cursor" : (info.from.line + "," + info.from.ch);
-					var message = escapeHtml(info.message.replace(/ at line \d.+$/, ""));
-					if (message.length > 100) {
-						message = message.substr(0, 100) + "...";
-					}
-					if (isActiveLine || oldMarkers[pos] == message) {
-						delete oldMarkers[pos];
-					}
-					newMarkers[pos] = message;
-					return "<tr class='" + info.severity + "'>" +
-						"<td role='severity' class='CodeMirror-lint-marker-" + info.severity + "'>" +
-							info.severity + "</td>" +
-						"<td role='line'>" + (info.from.line+1) + "</td>" +
-						"<td role='sep'>:</td>" +
-						"<td role='col'>" + (info.from.ch+1) + "</td>" +
-						"<td role='message'>" + message + "</td></tr>";
-				}).join("") + "</tbody>";
-			state.markedLast = newMarkers;
-			fixedOldIssues |= state.reportDisplayed && Object.keys(oldMarkers).length > 0;
-			if (state.html != html) {
-				state.html = html;
-				changed = true;
-			}
-		});
-		if (changed) {
-			clearTimeout(state ? state.renderTimeout : undefined);
-			if (!state || !state.postponeNewIssues || fixedOldIssues) {
-				renderLintReport(true);
-			} else {
-				state.renderTimeout = setTimeout(function() {
-					renderLintReport(true);
-				}, CodeMirror.defaults.lintReportDelay);
-			}
-		}
-	}
-	function escapeHtml(html) {
-		var chars = {"&": "&amp;", "<": "&lt;", ">": "&gt;", '"': '&quot;', "'": '&#39;', "/": '&#x2F;'};
-		return html.replace(/[&<>"'\/]/g, function(char) { return chars[char] });
-	}
+  function update(cm) {
+    var scope = cm ? [cm] : editors;
+    var changed = false;
+    var fixedOldIssues = false;
+    scope.forEach(function(cm) {
+      var state = cm.state.lint || {};
+      var oldMarkers = state.markedLast || {};
+      var newMarkers = {};
+      var html = !state.marked || state.marked.length == 0 ? "" : "<tbody>" +
+        state.marked.map(function(mark) {
+          var info = mark.__annotation;
+          var isActiveLine = info.from.line == cm.getCursor().line;
+          var pos = isActiveLine ? "cursor" : (info.from.line + "," + info.from.ch);
+          var message = escapeHtml(info.message.replace(/ at line \d.+$/, ""));
+          if (message.length > 100) {
+            message = message.substr(0, 100) + "...";
+          }
+          if (isActiveLine || oldMarkers[pos] == message) {
+            delete oldMarkers[pos];
+          }
+          newMarkers[pos] = message;
+          return "<tr class='" + info.severity + "'>" +
+            "<td role='severity' class='CodeMirror-lint-marker-" + info.severity + "'>" +
+              info.severity + "</td>" +
+            "<td role='line'>" + (info.from.line+1) + "</td>" +
+            "<td role='sep'>:</td>" +
+            "<td role='col'>" + (info.from.ch+1) + "</td>" +
+            "<td role='message'>" + message + "</td></tr>";
+        }).join("") + "</tbody>";
+      state.markedLast = newMarkers;
+      fixedOldIssues |= state.reportDisplayed && Object.keys(oldMarkers).length > 0;
+      if (state.html != html) {
+        state.html = html;
+        changed = true;
+      }
+    });
+    if (changed) {
+      clearTimeout(state ? state.renderTimeout : undefined);
+      if (!state || !state.postponeNewIssues || fixedOldIssues) {
+        renderLintReport(true);
+      } else {
+        state.renderTimeout = setTimeout(function() {
+          renderLintReport(true);
+        }, CodeMirror.defaults.lintReportDelay);
+      }
+    }
+  }
+  function escapeHtml(html) {
+    var chars = {"&": "&amp;", "<": "&lt;", ">": "&gt;", '"': '&quot;', "'": '&#39;', "/": '&#x2F;'};
+    return html.replace(/[&<>"'\/]/g, function(char) { return chars[char] });
+  }
 }
 
 function renderLintReport(someBlockChanged) {
-	var container = document.getElementById("lint");
-	var content = container.children[1];
-	var label = t("sectionCode");
-	var newContent = content.cloneNode(false);
-	var issueCount = 0;
-	editors.forEach(function(cm, index) {
-		if (cm.state.lint && cm.state.lint.html) {
-			var newBlock = newContent.appendChild(document.createElement("table"));
-			var html = "<caption>" + label + " " + (index+1) + "</caption>" + cm.state.lint.html;
-			newBlock.innerHTML = html;
-			newBlock.cm = cm;
-			issueCount += newBlock.rows.length;
+  var container = document.getElementById("lint");
+  var content = container.children[1];
+  var label = t("sectionCode");
+  var newContent = content.cloneNode(false);
+  var issueCount = 0;
+  editors.forEach(function(cm, index) {
+    if (cm.state.lint && cm.state.lint.html) {
+      var newBlock = newContent.appendChild(document.createElement("table"));
+      var html = "<caption>" + label + " " + (index+1) + "</caption>" + cm.state.lint.html;
+      newBlock.innerHTML = html;
+      newBlock.cm = cm;
+      issueCount += newBlock.rows.length;
 
-			var block = content.children[newContent.children.length - 1];
-			var blockChanged = !block || cm != block.cm || html != block.innerHTML;
-			someBlockChanged |= blockChanged;
-			cm.state.lint.reportDisplayed = blockChanged;
-		}
-	});
-	if (someBlockChanged || newContent.children.length != content.children.length) {
-		document.getElementById('issue-count').textContent = issueCount;
-		container.replaceChild(newContent, content);
-		container.style.display = newContent.children.length ? "block" : "none";
-		resizeLintReport(null, newContent);
-	}
+      var block = content.children[newContent.children.length - 1];
+      var blockChanged = !block || cm != block.cm || html != block.innerHTML;
+      someBlockChanged |= blockChanged;
+      cm.state.lint.reportDisplayed = blockChanged;
+    }
+  });
+  if (someBlockChanged || newContent.children.length != content.children.length) {
+    document.getElementById('issue-count').textContent = issueCount;
+    container.replaceChild(newContent, content);
+    container.style.display = newContent.children.length ? "block" : "none";
+    resizeLintReport(null, newContent);
+  }
 }
 
 function resizeLintReport(event, content) {
-	content = content || document.getElementById("lint").children[1];
-	if (content.children.length) {
-		var bounds = content.getBoundingClientRect();
-		var newMaxHeight = bounds.bottom <= innerHeight ? '' : (innerHeight - bounds.top) + "px";
-		if (newMaxHeight != content.style.maxHeight) {
-			content.style.maxHeight = newMaxHeight;
-		}
-	}
+  content = content || document.getElementById("lint").children[1];
+  if (content.children.length) {
+    var bounds = content.getBoundingClientRect();
+    var newMaxHeight = bounds.bottom <= innerHeight ? '' : (innerHeight - bounds.top) + "px";
+    if (newMaxHeight != content.style.maxHeight) {
+      content.style.maxHeight = newMaxHeight;
+    }
+  }
 }
 
 function gotoLintIssue(event) {
-	var issue = event.target.closest("tr");
-	if (!issue) {
-		return;
-	}
-	var block = issue.closest("table");
-	makeSectionVisible(block.cm);
-	block.cm.focus();
-	block.cm.setSelection({
-		line: parseInt(issue.querySelector("td[role='line']").textContent) - 1,
-		ch: parseInt(issue.querySelector("td[role='col']").textContent) - 1
-	});
+  var issue = event.target.closest("tr");
+  if (!issue) {
+    return;
+  }
+  var block = issue.closest("table");
+  makeSectionVisible(block.cm);
+  block.cm.focus();
+  block.cm.setSelection({
+    line: parseInt(issue.querySelector("td[role='line']").textContent) - 1,
+    ch: parseInt(issue.querySelector("td[role='col']").textContent) - 1
+  });
 }
 
 function toggleLintReport() {
-	document.getElementById("lint").classList.toggle("collapsed");
+  document.getElementById("lint").classList.toggle("collapsed");
 }
 
 function beautify(event) {
-	if (exports.css_beautify) { // thanks to csslint's definition of 'exports'
-		doBeautify();
-	} else {
-		var script = document.head.appendChild(document.createElement("script"));
-		script.src = "vendor-overwrites/beautify/beautify-css-mod.js";
-		script.onload = doBeautify;
-	}
-	function doBeautify() {
-		var tabs = prefs.get("editor.indentWithTabs");
-		var options = prefs.get("editor.beautify");
-		options.indent_size = tabs ? 1 : prefs.get("editor.tabSize");
-		options.indent_char = tabs ? "\t" : " ";
+  if (exports.css_beautify) { // thanks to csslint's definition of 'exports'
+    doBeautify();
+  } else {
+    var script = document.head.appendChild(document.createElement("script"));
+    script.src = "vendor-overwrites/beautify/beautify-css-mod.js";
+    script.onload = doBeautify;
+  }
+  function doBeautify() {
+    var tabs = prefs.get("editor.indentWithTabs");
+    var options = prefs.get("editor.beautify");
+    options.indent_size = tabs ? 1 : prefs.get("editor.tabSize");
+    options.indent_char = tabs ? "\t" : " ";
 
-		var section = getSectionForChild(event.target);
-		var scope = section ? [section.CodeMirror] : editors;
+    var section = getSectionForChild(event.target);
+    var scope = section ? [section.CodeMirror] : editors;
 
-		showHelp(t("styleBeautify"), "<div class='beautify-options'>" +
-			optionHtml(".selector1,", "selector_separator_newline") +
-			optionHtml(".selector2,", "newline_before_open_brace") +
-			optionHtml("{", "newline_after_open_brace") +
-			optionHtml("border: none;", "newline_between_properties", true) +
-			optionHtml("display: block;", "newline_before_close_brace", true) +
-			optionHtml("}", "newline_between_rules") +
-			`<label style="display: block; clear: both;"><input data-option="indent_conditional" type="checkbox"
-				${options.indent_conditional !== false ? 'checked' : ''}>` +
-				t('styleBeautifyIndentConditional') + '</label>' +
-			"</div>" +
-			"<div><button role='undo'></button></div>");
+    showHelp(t("styleBeautify"), "<div class='beautify-options'>" +
+      optionHtml(".selector1,", "selector_separator_newline") +
+      optionHtml(".selector2,", "newline_before_open_brace") +
+      optionHtml("{", "newline_after_open_brace") +
+      optionHtml("border: none;", "newline_between_properties", true) +
+      optionHtml("display: block;", "newline_before_close_brace", true) +
+      optionHtml("}", "newline_between_rules") +
+      `<label style="display: block; clear: both;"><input data-option="indent_conditional" type="checkbox"
+        ${options.indent_conditional !== false ? 'checked' : ''}>` +
+        t('styleBeautifyIndentConditional') + '</label>' +
+      "</div>" +
+      "<div><button role='undo'></button></div>");
 
-		var undoButton = document.querySelector("#help-popup button[role='undo']");
-		undoButton.textContent = t(scope.length == 1 ? "undo" : "undoGlobal");
-		undoButton.addEventListener("click", function() {
-			var undoable = false;
-			scope.forEach(function(cm) {
-				if (cm.beautifyChange && cm.beautifyChange[cm.changeGeneration()]) {
-					delete cm.beautifyChange[cm.changeGeneration()];
-					cm.undo();
-					cm.scrollIntoView(cm.getCursor());
-					undoable |= cm.beautifyChange[cm.changeGeneration()];
-				}
-			});
-			undoButton.disabled = !undoable;
-		});
+    var undoButton = document.querySelector("#help-popup button[role='undo']");
+    undoButton.textContent = t(scope.length == 1 ? "undo" : "undoGlobal");
+    undoButton.addEventListener("click", function() {
+      var undoable = false;
+      scope.forEach(function(cm) {
+        if (cm.beautifyChange && cm.beautifyChange[cm.changeGeneration()]) {
+          delete cm.beautifyChange[cm.changeGeneration()];
+          cm.undo();
+          cm.scrollIntoView(cm.getCursor());
+          undoable |= cm.beautifyChange[cm.changeGeneration()];
+        }
+      });
+      undoButton.disabled = !undoable;
+    });
 
-		scope.forEach(function(cm) {
-			setTimeout(function() {
-				const pos = options.translate_positions =
-					[].concat.apply([], cm.doc.sel.ranges.map(r =>
-						[Object.assign({}, r.anchor), Object.assign({}, r.head)]));
-				var text = cm.getValue();
-				var newText = exports.css_beautify(text, options);
-				if (newText != text) {
-					if (!cm.beautifyChange || !cm.beautifyChange[cm.changeGeneration()]) {
-						// clear the list if last change wasn't a css-beautify
-						cm.beautifyChange = {};
-					}
-					cm.setValue(newText);
-					const selections = [];
-					for (let i = 0; i < pos.length; i += 2) {
-						selections.push({anchor: pos[i], head: pos[i + 1]});
-					}
-					cm.setSelections(selections);
-					cm.beautifyChange[cm.changeGeneration()] = true;
-					undoButton.disabled = false;
-				}
-			}, 0);
-		});
+    scope.forEach(function(cm) {
+      setTimeout(function() {
+        const pos = options.translate_positions =
+          [].concat.apply([], cm.doc.sel.ranges.map(r =>
+            [Object.assign({}, r.anchor), Object.assign({}, r.head)]));
+        var text = cm.getValue();
+        var newText = exports.css_beautify(text, options);
+        if (newText != text) {
+          if (!cm.beautifyChange || !cm.beautifyChange[cm.changeGeneration()]) {
+            // clear the list if last change wasn't a css-beautify
+            cm.beautifyChange = {};
+          }
+          cm.setValue(newText);
+          const selections = [];
+          for (let i = 0; i < pos.length; i += 2) {
+            selections.push({anchor: pos[i], head: pos[i + 1]});
+          }
+          cm.setSelections(selections);
+          cm.beautifyChange[cm.changeGeneration()] = true;
+          undoButton.disabled = false;
+        }
+      }, 0);
+    });
 
-		document.querySelector('.beautify-options').onchange = ({target}) => {
-			const value = target.type == 'checkbox' ? target.checked : target.selectedIndex > 0;
-			prefs.set('editor.beautify', Object.assign(options, {[target.dataset.option]: value}));
-			if (target.parentNode.hasAttribute('newline')) {
-				target.parentNode.setAttribute('newline', value.toString());
-			}
-			doBeautify();
-		};
+    document.querySelector('.beautify-options').onchange = ({target}) => {
+      const value = target.type == 'checkbox' ? target.checked : target.selectedIndex > 0;
+      prefs.set('editor.beautify', Object.assign(options, {[target.dataset.option]: value}));
+      if (target.parentNode.hasAttribute('newline')) {
+        target.parentNode.setAttribute('newline', value.toString());
+      }
+      doBeautify();
+    };
 
-		function optionHtml(label, optionName, indent) {
-			var value = options[optionName];
-			return "<div newline='" + value.toString() + "'>" +
-				"<span" + (indent ? " indent" : "") + ">" + label + "</span>" +
-				"<select data-option='" + optionName + "'>" +
-					"<option" + (value ? "" : " selected") + ">&nbsp;</option>" +
-					"<option" + (value ? " selected" : "") + ">\\n</option>" +
-				"</select></div>";
-		}
-	}
+    function optionHtml(label, optionName, indent) {
+      var value = options[optionName];
+      return "<div newline='" + value.toString() + "'>" +
+        "<span" + (indent ? " indent" : "") + ">" + label + "</span>" +
+        "<select data-option='" + optionName + "'>" +
+          "<option" + (value ? "" : " selected") + ">&nbsp;</option>" +
+          "<option" + (value ? " selected" : "") + ">\\n</option>" +
+        "</select></div>";
+    }
+  }
 }
 
 document.addEventListener("DOMContentLoaded", init);
 
 function init() {
-	initCodeMirror();
-	var params = getParams();
-	if (!params.id) { // match should be 2 - one for the whole thing, one for the parentheses
-		// This is an add
-		tE("heading", "addStyleTitle");
-		var section = {code: ""}
-		for (var i in CssToProperty) {
-			if (params[i]) {
-				section[CssToProperty[i]] = [params[i]];
-			}
-		}
-		window.onload = () => {
-			window.onload = null;
-			addSection(null, section);
-			editors[0].setOption('lint', CodeMirror.defaults.lint);
-			// default to enabled
-			document.getElementById("enabled").checked = true
-			initHooks();
-		};
-		return;
-	}
-	// This is an edit
-	tE("heading", "editStyleHeading", null, false);
-	getStylesSafe({id: params.id}).then(styles => {
-		let style = styles[0];
-		if (!style) {
-			style = {id: null, sections: []};
-			history.replaceState({}, document.title, location.pathname);
-		}
-		styleId = style.id;
-		setStyleMeta(style);
-		window.onload = () => {
-			window.onload = null;
-			initWithStyle({style});
-		};
-		if (document.readyState != 'loading') {
-			window.onload();
-		}
-	});
+  initCodeMirror();
+  var params = getParams();
+  if (!params.id) { // match should be 2 - one for the whole thing, one for the parentheses
+    // This is an add
+    tE("heading", "addStyleTitle");
+    var section = {code: ""}
+    for (var i in CssToProperty) {
+      if (params[i]) {
+        section[CssToProperty[i]] = [params[i]];
+      }
+    }
+    window.onload = () => {
+      window.onload = null;
+      addSection(null, section);
+      editors[0].setOption('lint', CodeMirror.defaults.lint);
+      // default to enabled
+      document.getElementById("enabled").checked = true
+      initHooks();
+    };
+    return;
+  }
+  // This is an edit
+  tE("heading", "editStyleHeading", null, false);
+  getStylesSafe({id: params.id}).then(styles => {
+    let style = styles[0];
+    if (!style) {
+      style = {id: null, sections: []};
+      history.replaceState({}, document.title, location.pathname);
+    }
+    styleId = style.id;
+    setStyleMeta(style);
+    window.onload = () => {
+      window.onload = null;
+      initWithStyle({style});
+    };
+    if (document.readyState != 'loading') {
+      window.onload();
+    }
+  });
 }
 
 function setStyleMeta(style) {
-	document.getElementById("name").value = style.name;
-	document.getElementById("enabled").checked = style.enabled;
-	document.getElementById("url").href = style.url;
+  document.getElementById("name").value = style.name;
+  document.getElementById("enabled").checked = style.enabled;
+  document.getElementById("url").href = style.url;
 }
 
 function initWithStyle({style, codeIsUpdated}) {
-	setStyleMeta(style);
+  setStyleMeta(style);
 
-	if (codeIsUpdated === false) {
-		setCleanGlobal();
-		updateTitle();
-		return;
-	}
+  if (codeIsUpdated === false) {
+    setCleanGlobal();
+    updateTitle();
+    return;
+  }
 
-	// if this was done in response to an update, we need to clear existing sections
-	getSections().forEach(function(div) { div.remove(); });
-	var queue = style.sections.length ? style.sections.slice() : [{code: ""}];
-	var queueStart = new Date().getTime();
-	// after 100ms the sections will be added asynchronously
-	while (new Date().getTime() - queueStart <= 100 && queue.length) {
-		add();
-	}
-	(function processQueue() {
-		if (queue.length) {
-			add();
-			setTimeout(processQueue, 0);
-		}
-	})();
-	initHooks();
+  // if this was done in response to an update, we need to clear existing sections
+  getSections().forEach(function(div) { div.remove(); });
+  var queue = style.sections.length ? style.sections.slice() : [{code: ""}];
+  var queueStart = new Date().getTime();
+  // after 100ms the sections will be added asynchronously
+  while (new Date().getTime() - queueStart <= 100 && queue.length) {
+    add();
+  }
+  (function processQueue() {
+    if (queue.length) {
+      add();
+      setTimeout(processQueue, 0);
+    }
+  })();
+  initHooks();
 
-	function add() {
-		var sectionDiv = addSection(null, queue.shift());
-		maximizeCodeHeight(sectionDiv, !queue.length);
-		const cm = sectionDiv.CodeMirror;
-		setTimeout(() => {
-			cm.setOption('lint', CodeMirror.defaults.lint);
-			updateLintReport(cm, 0);
-		}, prefs.get("editor.lintDelay"));
-	}
+  function add() {
+    var sectionDiv = addSection(null, queue.shift());
+    maximizeCodeHeight(sectionDiv, !queue.length);
+    const cm = sectionDiv.CodeMirror;
+    setTimeout(() => {
+      cm.setOption('lint', CodeMirror.defaults.lint);
+      updateLintReport(cm, 0);
+    }, prefs.get("editor.lintDelay"));
+  }
 }
 
 function initHooks() {
-	document.querySelectorAll("#header .style-contributor").forEach(function(node) {
-		node.addEventListener("change", onChange);
-		node.addEventListener("input", onChange);
-	});
-	document.getElementById("toggle-style-help").addEventListener("click", showToggleStyleHelp);
-	document.getElementById("to-mozilla").addEventListener("click", showMozillaFormat, false);
-	document.getElementById("to-mozilla-help").addEventListener("click", showToMozillaHelp, false);
-	document.getElementById("from-mozilla").addEventListener("click", fromMozillaFormat);
-	document.getElementById("beautify").addEventListener("click", beautify);
-	document.getElementById("save-button").addEventListener("click", save, false);
-	document.getElementById("sections-help").addEventListener("click", showSectionHelp, false);
-	document.getElementById("keyMap-help").addEventListener("click", showKeyMapHelp, false);
-	document.getElementById("cancel-button").addEventListener("click", goBackToManage);
-	document.getElementById("lint-help").addEventListener("click", showLintHelp);
-	document.getElementById("lint").addEventListener("click", gotoLintIssue);
-	window.addEventListener("resize", resizeLintReport);
+  document.querySelectorAll("#header .style-contributor").forEach(function(node) {
+    node.addEventListener("change", onChange);
+    node.addEventListener("input", onChange);
+  });
+  document.getElementById("toggle-style-help").addEventListener("click", showToggleStyleHelp);
+  document.getElementById("to-mozilla").addEventListener("click", showMozillaFormat, false);
+  document.getElementById("to-mozilla-help").addEventListener("click", showToMozillaHelp, false);
+  document.getElementById("from-mozilla").addEventListener("click", fromMozillaFormat);
+  document.getElementById("beautify").addEventListener("click", beautify);
+  document.getElementById("save-button").addEventListener("click", save, false);
+  document.getElementById("sections-help").addEventListener("click", showSectionHelp, false);
+  document.getElementById("keyMap-help").addEventListener("click", showKeyMapHelp, false);
+  document.getElementById("cancel-button").addEventListener("click", goBackToManage);
+  document.getElementById("lint-help").addEventListener("click", showLintHelp);
+  document.getElementById("lint").addEventListener("click", gotoLintIssue);
+  window.addEventListener("resize", resizeLintReport);
 
-	// touch devices don't have onHover events so the element we'll be toggled via clicking (touching)
-	if ("ontouchstart" in document.body) {
-		document.querySelector("#lint h2").addEventListener("click", toggleLintReport);
-	}
+  // touch devices don't have onHover events so the element we'll be toggled via clicking (touching)
+  if ("ontouchstart" in document.body) {
+    document.querySelector("#lint h2").addEventListener("click", toggleLintReport);
+  }
 
-	document.querySelectorAll(
-		'input:not([type]), input[type="text"], input[type="search"], input[type="number"]')
-		.forEach(e => e.addEventListener('mousedown', toggleContextMenuDelete));
+  document.querySelectorAll(
+    'input:not([type]), input[type="text"], input[type="search"], input[type="number"]')
+    .forEach(e => e.addEventListener('mousedown', toggleContextMenuDelete));
 
-	setupGlobalSearch();
-	setCleanGlobal();
-	updateTitle();
+  setupGlobalSearch();
+  setCleanGlobal();
+  updateTitle();
 }
 
 
 function toggleContextMenuDelete(event) {
-	if (event.button == 2 && prefs.get('editor.contextDelete')) {
-		chrome.contextMenus.update('editor.contextDelete', {
-			enabled: Boolean(
-				this.selectionStart != this.selectionEnd ||
-				this.somethingSelected && this.somethingSelected()
-			),
-		}, ignoreChromeError);
-	}
+  if (event.button == 2 && prefs.get('editor.contextDelete')) {
+    chrome.contextMenus.update('editor.contextDelete', {
+      enabled: Boolean(
+        this.selectionStart != this.selectionEnd ||
+        this.somethingSelected && this.somethingSelected()
+      ),
+    }, ignoreChromeError);
+  }
 }
 
 
 function maximizeCodeHeight(sectionDiv, isLast) {
-	var cm = sectionDiv.CodeMirror;
-	var stats = maximizeCodeHeight.stats = maximizeCodeHeight.stats || {totalHeight: 0, deltas: []};
-	if (!stats.cmActualHeight) {
-		stats.cmActualHeight = getComputedHeight(cm.display.wrapper);
-	}
-	if (!stats.sectionMarginTop) {
-		stats.sectionMarginTop = parseFloat(getComputedStyle(sectionDiv).marginTop);
-	}
-	var sectionTop = sectionDiv.getBoundingClientRect().top - stats.sectionMarginTop;
-	if (!stats.firstSectionTop) {
-		stats.firstSectionTop = sectionTop;
-	}
-	var extrasHeight = getComputedHeight(sectionDiv) - stats.cmActualHeight;
-	var cmMaxHeight = window.innerHeight - extrasHeight - sectionTop - stats.sectionMarginTop;
-	var cmDesiredHeight = cm.display.sizer.clientHeight + 2*cm.defaultTextHeight();
-	var cmGrantableHeight = Math.max(stats.cmActualHeight, Math.min(cmMaxHeight, cmDesiredHeight));
-	stats.deltas.push(cmGrantableHeight - stats.cmActualHeight);
-	stats.totalHeight += cmGrantableHeight + extrasHeight;
-	if (!isLast) {
-		return;
-	}
-	stats.totalHeight += stats.firstSectionTop;
-	if (stats.totalHeight <= window.innerHeight) {
-		editors.forEach(function(cm, index) {
-			cm.setSize(null, stats.deltas[index] + stats.cmActualHeight);
-		});
-		return;
-	}
-	// scale heights to fill the gap between last section and bottom edge of the window
-	var sections = document.getElementById("sections");
-	var available = window.innerHeight - sections.getBoundingClientRect().bottom -
-		parseFloat(getComputedStyle(sections).marginBottom);
-	if (available <= 0) {
-		return;
-	}
-	var totalDelta = stats.deltas.reduce(function(sum, d) { return sum + d; }, 0);
-	var q = available / totalDelta;
-	var baseHeight = stats.cmActualHeight - stats.sectionMarginTop;
-	stats.deltas.forEach(function(delta, index) {
-		editors[index].setSize(null, baseHeight + Math.floor(q * delta));
-	});
+  var cm = sectionDiv.CodeMirror;
+  var stats = maximizeCodeHeight.stats = maximizeCodeHeight.stats || {totalHeight: 0, deltas: []};
+  if (!stats.cmActualHeight) {
+    stats.cmActualHeight = getComputedHeight(cm.display.wrapper);
+  }
+  if (!stats.sectionMarginTop) {
+    stats.sectionMarginTop = parseFloat(getComputedStyle(sectionDiv).marginTop);
+  }
+  var sectionTop = sectionDiv.getBoundingClientRect().top - stats.sectionMarginTop;
+  if (!stats.firstSectionTop) {
+    stats.firstSectionTop = sectionTop;
+  }
+  var extrasHeight = getComputedHeight(sectionDiv) - stats.cmActualHeight;
+  var cmMaxHeight = window.innerHeight - extrasHeight - sectionTop - stats.sectionMarginTop;
+  var cmDesiredHeight = cm.display.sizer.clientHeight + 2*cm.defaultTextHeight();
+  var cmGrantableHeight = Math.max(stats.cmActualHeight, Math.min(cmMaxHeight, cmDesiredHeight));
+  stats.deltas.push(cmGrantableHeight - stats.cmActualHeight);
+  stats.totalHeight += cmGrantableHeight + extrasHeight;
+  if (!isLast) {
+    return;
+  }
+  stats.totalHeight += stats.firstSectionTop;
+  if (stats.totalHeight <= window.innerHeight) {
+    editors.forEach(function(cm, index) {
+      cm.setSize(null, stats.deltas[index] + stats.cmActualHeight);
+    });
+    return;
+  }
+  // scale heights to fill the gap between last section and bottom edge of the window
+  var sections = document.getElementById("sections");
+  var available = window.innerHeight - sections.getBoundingClientRect().bottom -
+    parseFloat(getComputedStyle(sections).marginBottom);
+  if (available <= 0) {
+    return;
+  }
+  var totalDelta = stats.deltas.reduce(function(sum, d) { return sum + d; }, 0);
+  var q = available / totalDelta;
+  var baseHeight = stats.cmActualHeight - stats.sectionMarginTop;
+  stats.deltas.forEach(function(delta, index) {
+    editors[index].setSize(null, baseHeight + Math.floor(q * delta));
+  });
 }
 
 function updateTitle() {
-	var DIRTY_TITLE = "* $";
+  var DIRTY_TITLE = "* $";
 
-	var name = document.getElementById("name").savedValue;
-	var clean = isCleanGlobal();
-	var title = styleId === null ? t("addStyleTitle") : t('editStyleTitle', [name]);
-	document.title = clean ? title : DIRTY_TITLE.replace("$", title);
+  var name = document.getElementById("name").savedValue;
+  var clean = isCleanGlobal();
+  var title = styleId === null ? t("addStyleTitle") : t('editStyleTitle', [name]);
+  document.title = clean ? title : DIRTY_TITLE.replace("$", title);
 }
 
 function validate() {
-	var name = document.getElementById("name").value;
-	if (name == "") {
-		return t("styleMissingName");
-	}
-	// validate the regexps
-	if (document.querySelectorAll(".applies-to-list").some(function(list) {
-		return list.childNodes.some(function(li) {
-			if (li.className == template.appliesToEverything.className) {
-				return false;
-			}
-			var valueElement = li.querySelector("[name=applies-value]");
-			var type = li.querySelector("[name=applies-type]").value;
-			var value = valueElement.value;
-			if (type && value) {
-				if (type == "regexp") {
-					try {
-						new RegExp(value);
-					} catch (ex) {
-						valueElement.focus();
-						return true;
-					}
-				}
-			}
-			return false;
-		});
-	})) {
-		return t("styleBadRegexp");
-	}
-	return null;
+  var name = document.getElementById("name").value;
+  if (name == "") {
+    return t("styleMissingName");
+  }
+  // validate the regexps
+  if (document.querySelectorAll(".applies-to-list").some(function(list) {
+    return list.childNodes.some(function(li) {
+      if (li.className == template.appliesToEverything.className) {
+        return false;
+      }
+      var valueElement = li.querySelector("[name=applies-value]");
+      var type = li.querySelector("[name=applies-type]").value;
+      var value = valueElement.value;
+      if (type && value) {
+        if (type == "regexp") {
+          try {
+            new RegExp(value);
+          } catch (ex) {
+            valueElement.focus();
+            return true;
+          }
+        }
+      }
+      return false;
+    });
+  })) {
+    return t("styleBadRegexp");
+  }
+  return null;
 }
 
 function save() {
-	updateLintReport(null, 0);
+  updateLintReport(null, 0);
 
-	// save the contents of the CodeMirror editors back into the textareas
-	for (var i=0; i < editors.length; i++) {
-		editors[i].save();
-	}
+  // save the contents of the CodeMirror editors back into the textareas
+  for (var i=0; i < editors.length; i++) {
+    editors[i].save();
+  }
 
-	var error = validate();
-	if (error) {
-		alert(error);
-		return;
-	}
-	var name = document.getElementById("name").value;
-	var enabled = document.getElementById("enabled").checked;
-	saveStyleSafe({
-		id: styleId,
-		name: name,
-		enabled: enabled,
-		reason: 'editSave',
-		sections: getSectionsHashes()
-	})
-		.then(saveComplete);
+  var error = validate();
+  if (error) {
+    alert(error);
+    return;
+  }
+  var name = document.getElementById("name").value;
+  var enabled = document.getElementById("enabled").checked;
+  saveStyleSafe({
+    id: styleId,
+    name: name,
+    enabled: enabled,
+    reason: 'editSave',
+    sections: getSectionsHashes()
+  })
+    .then(saveComplete);
 }
 
 function getSectionsHashes() {
-	var sections = [];
-	getSections().forEach(function(div) {
-		var meta = getMeta(div);
-		var code = div.CodeMirror.getValue();
-		if (/^\s*$/.test(code) && Object.keys(meta).length == 0) {
-			return;
-		}
-		meta.code = code;
-		sections.push(meta);
-	});
-	return sections;
+  var sections = [];
+  getSections().forEach(function(div) {
+    var meta = getMeta(div);
+    var code = div.CodeMirror.getValue();
+    if (/^\s*$/.test(code) && Object.keys(meta).length == 0) {
+      return;
+    }
+    meta.code = code;
+    sections.push(meta);
+  });
+  return sections;
 }
 
 function getMeta(e) {
-	var meta = {urls: [], urlPrefixes: [], domains: [], regexps: []};
-	e.querySelector(".applies-to-list").childNodes.forEach(function(li) {
-		if (li.className == template.appliesToEverything.className) {
-			return;
-		}
-		var type = li.querySelector("[name=applies-type]").value;
-		var value = li.querySelector("[name=applies-value]").value;
-		if (type && value) {
-			var property = CssToProperty[type];
-			meta[property].push(value);
-		}
-	});
-	return meta;
+  var meta = {urls: [], urlPrefixes: [], domains: [], regexps: []};
+  e.querySelector(".applies-to-list").childNodes.forEach(function(li) {
+    if (li.className == template.appliesToEverything.className) {
+      return;
+    }
+    var type = li.querySelector("[name=applies-type]").value;
+    var value = li.querySelector("[name=applies-value]").value;
+    if (type && value) {
+      var property = CssToProperty[type];
+      meta[property].push(value);
+    }
+  });
+  return meta;
 }
 
 function saveComplete(style) {
-	styleId = style.id;
-	setCleanGlobal();
+  styleId = style.id;
+  setCleanGlobal();
 
-	// Go from new style URL to edit style URL
-	if (location.href.indexOf("id=") == -1) {
-		history.replaceState({}, document.title, "edit.html?id=" + style.id);
-		tE("heading", "editStyleHeading", null, false);
-	}
-	updateTitle();
+  // Go from new style URL to edit style URL
+  if (location.href.indexOf("id=") == -1) {
+    history.replaceState({}, document.title, "edit.html?id=" + style.id);
+    tE("heading", "editStyleHeading", null, false);
+  }
+  updateTitle();
 }
 
 function showMozillaFormat() {
-	var popup = showCodeMirrorPopup(t("styleToMozillaFormatTitle"), "", {readOnly: true});
-	popup.codebox.setValue(toMozillaFormat());
-	popup.codebox.execCommand("selectAll");
+  var popup = showCodeMirrorPopup(t("styleToMozillaFormatTitle"), "", {readOnly: true});
+  popup.codebox.setValue(toMozillaFormat());
+  popup.codebox.execCommand("selectAll");
 }
 
 function toMozillaFormat() {
-	return getSectionsHashes().map(function(section) {
-		var cssMds = [];
-		for (var i in propertyToCss) {
-			if (section[i]) {
-				cssMds = cssMds.concat(section[i].map(function (v){
-					return propertyToCss[i] + "(\"" + v.replace(/\\/g, "\\\\") + "\")";
-				}));
-			}
-		}
-		return cssMds.length ? "@-moz-document " + cssMds.join(", ") + " {\n" + section.code + "\n}" : section.code;
-	}).join("\n\n");
+  return getSectionsHashes().map(function(section) {
+    var cssMds = [];
+    for (var i in propertyToCss) {
+      if (section[i]) {
+        cssMds = cssMds.concat(section[i].map(function (v){
+          return propertyToCss[i] + "(\"" + v.replace(/\\/g, "\\\\") + "\")";
+        }));
+      }
+    }
+    return cssMds.length ? "@-moz-document " + cssMds.join(", ") + " {\n" + section.code + "\n}" : section.code;
+  }).join("\n\n");
 }
 
 function fromMozillaFormat() {
-	var popup = showCodeMirrorPopup(t("styleFromMozillaFormatPrompt"), tHTML("<div>\
-		<button name='import-append' i18n-text='importAppendLabel' i18n-title='importAppendTooltip'></button>\
-		<button name='import-replace' i18n-text='importReplaceLabel' i18n-title='importReplaceTooltip'></button>\
-		</div>").innerHTML);
+  var popup = showCodeMirrorPopup(t("styleFromMozillaFormatPrompt"), tHTML("<div>\
+    <button name='import-append' i18n-text='importAppendLabel' i18n-title='importAppendTooltip'></button>\
+    <button name='import-replace' i18n-text='importReplaceLabel' i18n-title='importReplaceTooltip'></button>\
+    </div>").innerHTML);
 
-	var contents = popup.querySelector(".contents");
-	contents.insertBefore(popup.codebox.display.wrapper, contents.firstElementChild);
-	popup.codebox.focus();
+  var contents = popup.querySelector(".contents");
+  contents.insertBefore(popup.codebox.display.wrapper, contents.firstElementChild);
+  popup.codebox.focus();
 
-	popup.querySelector("[name='import-append']").addEventListener("click", doImport);
-	popup.querySelector("[name='import-replace']").addEventListener("click", doImport);
+  popup.querySelector("[name='import-append']").addEventListener("click", doImport);
+  popup.querySelector("[name='import-replace']").addEventListener("click", doImport);
 
-	popup.codebox.on("change", function() {
-		clearTimeout(popup.mozillaTimeout);
-		popup.mozillaTimeout = setTimeout(function() {
-			popup.classList.toggle("ready", trimNewLines(popup.codebox.getValue()));
-		}, 100);
-	});
+  popup.codebox.on("change", function() {
+    clearTimeout(popup.mozillaTimeout);
+    popup.mozillaTimeout = setTimeout(function() {
+      popup.classList.toggle("ready", trimNewLines(popup.codebox.getValue()));
+    }, 100);
+  });
 
-	function doImport() {
-		var replaceOldStyle = this.name == "import-replace";
-		popup.querySelector(".dismiss").onclick();
-		var mozStyle = trimNewLines(popup.codebox.getValue());
-		var parser = new parserlib.css.Parser(), lines = mozStyle.split("\n");
-		var sectionStack = [{code: "", start: {line: 1, col: 1}}];
-		var errors = "", oldSectionCount = editors.length;
-		var firstAddedCM;
+  function doImport() {
+    var replaceOldStyle = this.name == "import-replace";
+    popup.querySelector(".dismiss").onclick();
+    var mozStyle = trimNewLines(popup.codebox.getValue());
+    var parser = new parserlib.css.Parser(), lines = mozStyle.split("\n");
+    var sectionStack = [{code: "", start: {line: 1, col: 1}}];
+    var errors = "", oldSectionCount = editors.length;
+    var firstAddedCM;
 
-		parser.addListener("startdocument", function(e) {
-			var outerText = getRange(sectionStack.last.start, (--e.col, e));
-			var gapComment = outerText.match(/(\/\*[\s\S]*?\*\/)[\s\n]*$/);
-			var section = {code: "", start: backtrackTo(this, parserlib.css.Tokens.LBRACE, "end")};
-			// move last comment before @-moz-document inside the section
-			if (gapComment && !gapComment[1].match(/\/\*\s*AGENT_SHEET\s*\*\//)) {
-				section.code = gapComment[1] + "\n";
-				outerText = trimNewLines(outerText.substring(0, gapComment.index));
-			}
-			if (outerText.trim()) {
-				sectionStack.last.code = outerText;
-				doAddSection(sectionStack.last);
-				sectionStack.last.code = "";
-			}
-			e.functions.forEach(function(f) {
-				var m = f.match(/^(url|url-prefix|domain|regexp)\((['"]?)(.+?)\2?\)$/);
-				var aType = CssToProperty[m[1]];
-				var aValue = aType != "regexps" ? m[3] : m[3].replace(/\\\\/g, "\\");
-				(section[aType] = section[aType] || []).push(aValue);
-			});
-			sectionStack.push(section);
-		});
+    parser.addListener("startdocument", function(e) {
+      var outerText = getRange(sectionStack.last.start, (--e.col, e));
+      var gapComment = outerText.match(/(\/\*[\s\S]*?\*\/)[\s\n]*$/);
+      var section = {code: "", start: backtrackTo(this, parserlib.css.Tokens.LBRACE, "end")};
+      // move last comment before @-moz-document inside the section
+      if (gapComment && !gapComment[1].match(/\/\*\s*AGENT_SHEET\s*\*\//)) {
+        section.code = gapComment[1] + "\n";
+        outerText = trimNewLines(outerText.substring(0, gapComment.index));
+      }
+      if (outerText.trim()) {
+        sectionStack.last.code = outerText;
+        doAddSection(sectionStack.last);
+        sectionStack.last.code = "";
+      }
+      e.functions.forEach(function(f) {
+        var m = f.match(/^(url|url-prefix|domain|regexp)\((['"]?)(.+?)\2?\)$/);
+        var aType = CssToProperty[m[1]];
+        var aValue = aType != "regexps" ? m[3] : m[3].replace(/\\\\/g, "\\");
+        (section[aType] = section[aType] || []).push(aValue);
+      });
+      sectionStack.push(section);
+    });
 
-		parser.addListener("enddocument", function(e) {
-			var end = backtrackTo(this, parserlib.css.Tokens.RBRACE, "start");
-			var section = sectionStack.pop();
-			section.code += getRange(section.start, end);
-			sectionStack.last.start = (++end.col, end);
-			doAddSection(section);
-		});
+    parser.addListener("enddocument", function(e) {
+      var end = backtrackTo(this, parserlib.css.Tokens.RBRACE, "start");
+      var section = sectionStack.pop();
+      section.code += getRange(section.start, end);
+      sectionStack.last.start = (++end.col, end);
+      doAddSection(section);
+    });
 
-		parser.addListener("endstylesheet", function() {
-			// add nonclosed outer sections (either broken or the last global one)
-			var endOfText = {line: lines.length, col: lines.last.length + 1};
-			sectionStack.last.code += getRange(sectionStack.last.start, endOfText);
-			sectionStack.forEach(doAddSection);
+    parser.addListener("endstylesheet", function() {
+      // add nonclosed outer sections (either broken or the last global one)
+      var endOfText = {line: lines.length, col: lines.last.length + 1};
+      sectionStack.last.code += getRange(sectionStack.last.start, endOfText);
+      sectionStack.forEach(doAddSection);
 
-			delete maximizeCodeHeight.stats;
-			editors.forEach(function(cm) {
-				maximizeCodeHeight(cm.getSection(), cm == editors.last);
-			});
+      delete maximizeCodeHeight.stats;
+      editors.forEach(function(cm) {
+        maximizeCodeHeight(cm.getSection(), cm == editors.last);
+      });
 
-			makeSectionVisible(firstAddedCM);
-			firstAddedCM.focus();
+      makeSectionVisible(firstAddedCM);
+      firstAddedCM.focus();
 
-			if (errors) {
-				showHelp(t("issues"), errors);
-			}
-		});
+      if (errors) {
+        showHelp(t("issues"), errors);
+      }
+    });
 
-		parser.addListener("error", function(e) {
-			errors += e.line + ":" + e.col + " " + e.message.replace(/ at line \d.+$/, "") + "<br>";
-		});
+    parser.addListener("error", function(e) {
+      errors += e.line + ":" + e.col + " " + e.message.replace(/ at line \d.+$/, "") + "<br>";
+    });
 
-		parser.parse(mozStyle);
+    parser.parse(mozStyle);
 
-		function getRange( start, end) {
-			const L1 = start.line - 1, C1 = start.col - 1;
-			const L2 = end.line - 1, C2 = end.col - 1;
-			if (L1 == L2) {
-				return lines[L1].substr(C1, C2 - C1 + 1);
-			} else {
-				const middle = lines.slice(L1 + 1, L2).join('\n');
-				return lines[L1].substr(C1) + '\n' + middle +
-					(L2 >= lines.length ? '' : ((middle ? '\n' : '') + lines[L2].substring(0, C2)));
-			}
-		}
-		function doAddSection(section) {
-			section.code = section.code.trim();
-			// don't add empty sections
-			if (!section.code
-			&& !section.urls
-			&& !section.urlPrefixes
-			&& !section.domains
-			&& !section.regexps) {
-				return;
-			}
-			if (!firstAddedCM) {
-				if (!initFirstSection(section)) {
-					return;
-				}
-			}
-			setCleanItem(addSection(null, section), false);
-			firstAddedCM = firstAddedCM || editors.last;
-		}
-		// do onetime housekeeping as the imported text is confirmed to be a valid style
-		function initFirstSection(section) {
-			// skip adding the first global section when there's no code/comments
-			if (!section.code.replace("@namespace url(http://www.w3.org/1999/xhtml);", "") /* ignore boilerplate NS */
-					.replace(/[\s\n]/g, "")) { /* ignore all whitespace including new lines */
-				return false;
-			}
-			if (replaceOldStyle) {
-				editors.slice(0).reverse().forEach(function(cm) {
-					removeSection({target: cm.getSection().firstElementChild});
-				});
-			} else if (!editors.last.getValue()) {
-				// nuke the last blank section
-				if (editors.last.getSection().querySelector(".applies-to-everything")) {
-					removeSection({target: editors.last.getSection()});
-				}
-			}
-			return true;
-		}
-	}
-	function backtrackTo(parser, tokenType, startEnd) {
-		var tokens = parser._tokenStream._lt;
-		for (var i = parser._tokenStream._ltIndex - 1; i >= 0; --i) {
-			if (tokens[i].type == tokenType) {
-				return {line: tokens[i][startEnd+"Line"], col: tokens[i][startEnd+"Col"]};
-			}
-		}
-	}
-	function trimNewLines(s) {
-		return s.replace(/^[\s\n]+/, "").replace(/[\s\n]+$/, "");
-	}
+    function getRange( start, end) {
+      const L1 = start.line - 1, C1 = start.col - 1;
+      const L2 = end.line - 1, C2 = end.col - 1;
+      if (L1 == L2) {
+        return lines[L1].substr(C1, C2 - C1 + 1);
+      } else {
+        const middle = lines.slice(L1 + 1, L2).join('\n');
+        return lines[L1].substr(C1) + '\n' + middle +
+          (L2 >= lines.length ? '' : ((middle ? '\n' : '') + lines[L2].substring(0, C2)));
+      }
+    }
+    function doAddSection(section) {
+      section.code = section.code.trim();
+      // don't add empty sections
+      if (!section.code
+      && !section.urls
+      && !section.urlPrefixes
+      && !section.domains
+      && !section.regexps) {
+        return;
+      }
+      if (!firstAddedCM) {
+        if (!initFirstSection(section)) {
+          return;
+        }
+      }
+      setCleanItem(addSection(null, section), false);
+      firstAddedCM = firstAddedCM || editors.last;
+    }
+    // do onetime housekeeping as the imported text is confirmed to be a valid style
+    function initFirstSection(section) {
+      // skip adding the first global section when there's no code/comments
+      if (!section.code.replace("@namespace url(http://www.w3.org/1999/xhtml);", "") /* ignore boilerplate NS */
+          .replace(/[\s\n]/g, "")) { /* ignore all whitespace including new lines */
+        return false;
+      }
+      if (replaceOldStyle) {
+        editors.slice(0).reverse().forEach(function(cm) {
+          removeSection({target: cm.getSection().firstElementChild});
+        });
+      } else if (!editors.last.getValue()) {
+        // nuke the last blank section
+        if (editors.last.getSection().querySelector(".applies-to-everything")) {
+          removeSection({target: editors.last.getSection()});
+        }
+      }
+      return true;
+    }
+  }
+  function backtrackTo(parser, tokenType, startEnd) {
+    var tokens = parser._tokenStream._lt;
+    for (var i = parser._tokenStream._ltIndex - 1; i >= 0; --i) {
+      if (tokens[i].type == tokenType) {
+        return {line: tokens[i][startEnd+"Line"], col: tokens[i][startEnd+"Col"]};
+      }
+    }
+  }
+  function trimNewLines(s) {
+    return s.replace(/^[\s\n]+/, "").replace(/[\s\n]+$/, "");
+  }
 }
 
 function showSectionHelp() {
-	showHelp(t("styleSectionsTitle"), t("sectionHelp"));
+  showHelp(t("styleSectionsTitle"), t("sectionHelp"));
 }
 
 function showAppliesToHelp() {
-	showHelp(t("appliesLabel"), t("appliesHelp"));
+  showHelp(t("appliesLabel"), t("appliesHelp"));
 }
 
 function showToMozillaHelp() {
-	showHelp(t("styleMozillaFormatHeading"), t("styleToMozillaFormatHelp"));
+  showHelp(t("styleMozillaFormatHeading"), t("styleToMozillaFormatHelp"));
 }
 
 function showToggleStyleHelp() {
-	showHelp(t("helpAlt"), t("styleEnabledToggleHint"));
+  showHelp(t("helpAlt"), t("styleEnabledToggleHint"));
 }
 
 function showKeyMapHelp() {
-	var keyMap = mergeKeyMaps({}, prefs.get("editor.keyMap"), CodeMirror.defaults.extraKeys);
-	var keyMapSorted = Object.keys(keyMap)
-		.map(function(key) { return {key: key, cmd: keyMap[key]} })
-		.concat([{key: "Shift-Ctrl-Wheel", cmd: "scrollWindow"}])
-		.sort(function(a, b) { return a.cmd < b.cmd || (a.cmd == b.cmd && a.key < b.key) ? -1 : 1 });
-	showHelp(t("cm_keyMap") + ": " + prefs.get("editor.keyMap"),
-		'<table class="keymap-list">' +
-			'<thead><tr><th><input placeholder="' + t("helpKeyMapHotkey") + '" type="search"></th>' +
-				'<th><input placeholder="' + t("helpKeyMapCommand") + '" type="search"></th></tr></thead>' +
-			"<tbody>" + keyMapSorted.map(function(value) {
-				return "<tr><td>" + value.key + "</td><td>" + value.cmd + "</td></tr>";
-			}).join("") +
-			"</tbody>" +
-		"</table>");
+  var keyMap = mergeKeyMaps({}, prefs.get("editor.keyMap"), CodeMirror.defaults.extraKeys);
+  var keyMapSorted = Object.keys(keyMap)
+    .map(function(key) { return {key: key, cmd: keyMap[key]} })
+    .concat([{key: "Shift-Ctrl-Wheel", cmd: "scrollWindow"}])
+    .sort(function(a, b) { return a.cmd < b.cmd || (a.cmd == b.cmd && a.key < b.key) ? -1 : 1 });
+  showHelp(t("cm_keyMap") + ": " + prefs.get("editor.keyMap"),
+    '<table class="keymap-list">' +
+      '<thead><tr><th><input placeholder="' + t("helpKeyMapHotkey") + '" type="search"></th>' +
+        '<th><input placeholder="' + t("helpKeyMapCommand") + '" type="search"></th></tr></thead>' +
+      "<tbody>" + keyMapSorted.map(function(value) {
+        return "<tr><td>" + value.key + "</td><td>" + value.cmd + "</td></tr>";
+      }).join("") +
+      "</tbody>" +
+    "</table>");
 
-	var table = document.querySelector("#help-popup table");
-	table.addEventListener("input", filterTable);
+  var table = document.querySelector("#help-popup table");
+  table.addEventListener("input", filterTable);
 
-	var inputs = table.querySelectorAll("input");
-	inputs[0].addEventListener("keydown", hotkeyHandler);
-	inputs[1].focus();
+  var inputs = table.querySelectorAll("input");
+  inputs[0].addEventListener("keydown", hotkeyHandler);
+  inputs[1].focus();
 
-	function hotkeyHandler(event) {
-		var keyName = CodeMirror.keyName(event);
-		if (keyName == "Esc" || keyName == "Tab" || keyName == "Shift-Tab") {
-			return;
-		}
-		event.preventDefault();
-		event.stopPropagation();
-		// normalize order of modifiers,
-		// for modifier-only keys ("Ctrl-Shift") a dummy main key has to be temporarily added
-		var keyMap = {};
-		keyMap[keyName.replace(/(Shift|Ctrl|Alt|Cmd)$/, "$&-dummy")] = "";
-		var normalizedKey = Object.keys(CodeMirror.normalizeKeyMap(keyMap))[0];
-		this.value = normalizedKey.replace("-dummy", "");
-		filterTable(event);
-	}
-	function filterTable(event) {
-		var input = event.target;
-		var query = stringAsRegExp(input.value, "gi");
-		var col = input.parentNode.cellIndex;
-		inputs[1 - col].value = "";
-		table.tBodies[0].childNodes.forEach(function(row) {
-			var cell = row.children[col];
-			cell.innerHTML = cell.textContent.replace(query, "<mark>$&</mark>");
-			row.style.display = query.test(cell.textContent) ? "" : "none";
-			// clear highlight from the other column
-			cell = row.children[1 - col];
-			cell.innerHTML = cell.textContent;
-		});
-	}
-	function mergeKeyMaps(merged, ...more) {
-		more.forEach(keyMap => {
-			if (typeof keyMap == "string") {
-				keyMap = CodeMirror.keyMap[keyMap];
-			}
-			Object.keys(keyMap).forEach(function(key) {
-				var cmd = keyMap[key];
-				// filter out '...', 'attach', etc. (hotkeys start with an uppercase letter)
-				if (!merged[key] && !key.match(/^[a-z]/) && cmd != "...") {
-					if (typeof cmd == "function") {
-						// for 'emacs' keymap: provide at least something meaningful (hotkeys and the function body)
-						// for 'vim*' keymaps: almost nothing as it doesn't rely on CM keymap mechanism
-						cmd = cmd.toString().replace(/^function.*?\{[\s\r\n]*([\s\S]+?)[\s\r\n]*\}$/, "$1");
-						merged[key] = cmd.length <= 200 ? cmd : cmd.substr(0, 200) + "...";
-					} else {
-						merged[key] = cmd;
-					}
-				}
-			});
-			if (keyMap.fallthrough) {
-				merged = mergeKeyMaps(merged, keyMap.fallthrough);
-			}
-		});
-		return merged;
-	}
+  function hotkeyHandler(event) {
+    var keyName = CodeMirror.keyName(event);
+    if (keyName == "Esc" || keyName == "Tab" || keyName == "Shift-Tab") {
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+    // normalize order of modifiers,
+    // for modifier-only keys ("Ctrl-Shift") a dummy main key has to be temporarily added
+    var keyMap = {};
+    keyMap[keyName.replace(/(Shift|Ctrl|Alt|Cmd)$/, "$&-dummy")] = "";
+    var normalizedKey = Object.keys(CodeMirror.normalizeKeyMap(keyMap))[0];
+    this.value = normalizedKey.replace("-dummy", "");
+    filterTable(event);
+  }
+  function filterTable(event) {
+    var input = event.target;
+    var query = stringAsRegExp(input.value, "gi");
+    var col = input.parentNode.cellIndex;
+    inputs[1 - col].value = "";
+    table.tBodies[0].childNodes.forEach(function(row) {
+      var cell = row.children[col];
+      cell.innerHTML = cell.textContent.replace(query, "<mark>$&</mark>");
+      row.style.display = query.test(cell.textContent) ? "" : "none";
+      // clear highlight from the other column
+      cell = row.children[1 - col];
+      cell.innerHTML = cell.textContent;
+    });
+  }
+  function mergeKeyMaps(merged, ...more) {
+    more.forEach(keyMap => {
+      if (typeof keyMap == "string") {
+        keyMap = CodeMirror.keyMap[keyMap];
+      }
+      Object.keys(keyMap).forEach(function(key) {
+        var cmd = keyMap[key];
+        // filter out '...', 'attach', etc. (hotkeys start with an uppercase letter)
+        if (!merged[key] && !key.match(/^[a-z]/) && cmd != "...") {
+          if (typeof cmd == "function") {
+            // for 'emacs' keymap: provide at least something meaningful (hotkeys and the function body)
+            // for 'vim*' keymaps: almost nothing as it doesn't rely on CM keymap mechanism
+            cmd = cmd.toString().replace(/^function.*?\{[\s\r\n]*([\s\S]+?)[\s\r\n]*\}$/, "$1");
+            merged[key] = cmd.length <= 200 ? cmd : cmd.substr(0, 200) + "...";
+          } else {
+            merged[key] = cmd;
+          }
+        }
+      });
+      if (keyMap.fallthrough) {
+        merged = mergeKeyMaps(merged, keyMap.fallthrough);
+      }
+    });
+    return merged;
+  }
 }
 
 function showLintHelp() {
-	showHelp(t("issues"), t("issuesHelp") + "<ul>" +
-		CSSLint.getRules().map(function(rule) {
-			return "<li><b>" + rule.name + "</b><br>" + rule.desc + "</li>";
-		}).join("") + "</ul>"
-	);
+  showHelp(t("issues"), t("issuesHelp") + "<ul>" +
+    CSSLint.getRules().map(function(rule) {
+      return "<li><b>" + rule.name + "</b><br>" + rule.desc + "</li>";
+    }).join("") + "</ul>"
+  );
 }
 
 function showRegExpTester(event, section = getSectionForChild(this)) {
-	const GET_FAVICON_URL = 'https://www.google.com/s2/favicons?domain=';
-	const OWN_ICON = chrome.runtime.getManifest().icons['16'];
-	const cachedRegexps = showRegExpTester.cachedRegexps =
-		showRegExpTester.cachedRegexps || new Map();
-	const regexps = [...section.querySelector('.applies-to-list').children]
-		.map(item =>
-			!item.matches('.applies-to-everything') &&
-			item.querySelector('.applies-type').value == 'regexp' &&
-			item.querySelector('.applies-value').value.trim())
-		.filter(item => item)
-		.map(text => {
-			const rxData = Object.assign({text}, cachedRegexps.get(text));
-			if (!rxData.urls) {
-				cachedRegexps.set(text, Object.assign(rxData, {
-					rx: tryRegExp(text),
-					urls: new Map(),
-				}));
-			}
-			return rxData;
-		});
-	chrome.tabs.onUpdated.addListener(function _(tabId, info) {
-		if (document.querySelector('.regexp-report')) {
-			if (info.url) {
-				showRegExpTester(event, section);
-			}
-		} else {
-			chrome.tabs.onUpdated.removeListener(_);
-		}
-	});
-	queryTabs().then(tabs => {
-		const supported = tabs.map(tab => tab.url)
-			.filter(url => URLS.supported.test(url));
-		const unique = [...new Set(supported).values()];
-		for (const rxData of regexps) {
-			const {rx, urls} = rxData;
-			if (rx) {
-				const urlsNow = new Map();
-				for (const url of unique) {
-					const match = urls.get(url) || (url.match(rx) || [])[0];
-					if (match) {
-						urlsNow.set(url, match);
-					}
-				}
-				rxData.urls = urlsNow;
-			}
-		}
-		const moreInfoLink = template.regexpTestPartial.outerHTML;
-		const stats = {
-			full: {data: [], label: t('styleRegexpTestFull')},
-			partial: {data: [], label: t('styleRegexpTestPartial') + moreInfoLink},
-			none: {data: [], label: t('styleRegexpTestNone')},
-			invalid: {data: [], label: t('styleRegexpTestInvalid')},
-		};
-		for (const {text, rx, urls} of regexps) {
-			if (!rx) {
-				stats.invalid.data.push({text});
-				continue;
-			}
-			if (!urls.size) {
-				stats.none.data.push({text});
-				continue;
-			}
-			const full = [];
-			const partial = [];
-			for (const [url, match] of urls.entries()) {
-				const faviconUrl = url.startsWith(URLS.ownOrigin)
-					? OWN_ICON
-					: GET_FAVICON_URL + new URL(url).hostname;
-				const icon = `<img src="${faviconUrl}">`;
-				if (match.length == url.length) {
-					full.push(`<div>${icon + url}</div>`);
-				} else {
-					partial.push(`<div>${icon}<mark>${match}</mark>` +
-						url.substr(match.length) + '</div>');
-				}
-			}
-			if (full.length) {
-				stats.full.data.push({text, urls: full});
-			}
-			if (partial.length) {
-				stats.partial.data.push({text, urls: partial});
-			}
-		}
-		showHelp(t('styleRegexpTestTitle'),
-			'<div class="regexp-report">' +
-			Object.keys(stats).map(type => (!stats[type].data.length ? '' :
-				`<details open data-type="${type}">
-					<summary>${stats[type].label}</summary>` +
-					stats[type].data.map(({text, urls}) => (!urls ? text :
-						`<details open><summary>${text}</summary>${urls.join('')}</details>`
-					)).join('<br>') +
-				'</details>'
-			)).join('') +
-			'</div>');
-		document.querySelector('.regexp-report').onclick = event => {
-			const target = event.target.closest('a, .regexp-report div');
-			if (target) {
-				openURL({url: target.href || target.textContent});
-				event.preventDefault();
-			}
-		};
-	});
+  const GET_FAVICON_URL = 'https://www.google.com/s2/favicons?domain=';
+  const OWN_ICON = chrome.runtime.getManifest().icons['16'];
+  const cachedRegexps = showRegExpTester.cachedRegexps =
+    showRegExpTester.cachedRegexps || new Map();
+  const regexps = [...section.querySelector('.applies-to-list').children]
+    .map(item =>
+      !item.matches('.applies-to-everything') &&
+      item.querySelector('.applies-type').value == 'regexp' &&
+      item.querySelector('.applies-value').value.trim())
+    .filter(item => item)
+    .map(text => {
+      const rxData = Object.assign({text}, cachedRegexps.get(text));
+      if (!rxData.urls) {
+        cachedRegexps.set(text, Object.assign(rxData, {
+          rx: tryRegExp(text),
+          urls: new Map(),
+        }));
+      }
+      return rxData;
+    });
+  chrome.tabs.onUpdated.addListener(function _(tabId, info) {
+    if (document.querySelector('.regexp-report')) {
+      if (info.url) {
+        showRegExpTester(event, section);
+      }
+    } else {
+      chrome.tabs.onUpdated.removeListener(_);
+    }
+  });
+  queryTabs().then(tabs => {
+    const supported = tabs.map(tab => tab.url)
+      .filter(url => URLS.supported.test(url));
+    const unique = [...new Set(supported).values()];
+    for (const rxData of regexps) {
+      const {rx, urls} = rxData;
+      if (rx) {
+        const urlsNow = new Map();
+        for (const url of unique) {
+          const match = urls.get(url) || (url.match(rx) || [])[0];
+          if (match) {
+            urlsNow.set(url, match);
+          }
+        }
+        rxData.urls = urlsNow;
+      }
+    }
+    const moreInfoLink = template.regexpTestPartial.outerHTML;
+    const stats = {
+      full: {data: [], label: t('styleRegexpTestFull')},
+      partial: {data: [], label: t('styleRegexpTestPartial') + moreInfoLink},
+      none: {data: [], label: t('styleRegexpTestNone')},
+      invalid: {data: [], label: t('styleRegexpTestInvalid')},
+    };
+    for (const {text, rx, urls} of regexps) {
+      if (!rx) {
+        stats.invalid.data.push({text});
+        continue;
+      }
+      if (!urls.size) {
+        stats.none.data.push({text});
+        continue;
+      }
+      const full = [];
+      const partial = [];
+      for (const [url, match] of urls.entries()) {
+        const faviconUrl = url.startsWith(URLS.ownOrigin)
+          ? OWN_ICON
+          : GET_FAVICON_URL + new URL(url).hostname;
+        const icon = `<img src="${faviconUrl}">`;
+        if (match.length == url.length) {
+          full.push(`<div>${icon + url}</div>`);
+        } else {
+          partial.push(`<div>${icon}<mark>${match}</mark>` +
+            url.substr(match.length) + '</div>');
+        }
+      }
+      if (full.length) {
+        stats.full.data.push({text, urls: full});
+      }
+      if (partial.length) {
+        stats.partial.data.push({text, urls: partial});
+      }
+    }
+    showHelp(t('styleRegexpTestTitle'),
+      '<div class="regexp-report">' +
+      Object.keys(stats).map(type => (!stats[type].data.length ? '' :
+        `<details open data-type="${type}">
+          <summary>${stats[type].label}</summary>` +
+          stats[type].data.map(({text, urls}) => (!urls ? text :
+            `<details open><summary>${text}</summary>${urls.join('')}</details>`
+          )).join('<br>') +
+        '</details>'
+      )).join('') +
+      '</div>');
+    document.querySelector('.regexp-report').onclick = event => {
+      const target = event.target.closest('a, .regexp-report div');
+      if (target) {
+        openURL({url: target.href || target.textContent});
+        event.preventDefault();
+      }
+    };
+  });
 }
 
 function showHelp(title, text) {
-	var div = document.getElementById("help-popup");
-	div.classList.remove("big");
-	div.querySelector(".contents").innerHTML = text;
-	div.querySelector(".title").innerHTML = title;
+  var div = document.getElementById("help-popup");
+  div.classList.remove("big");
+  div.querySelector(".contents").innerHTML = text;
+  div.querySelector(".title").innerHTML = title;
 
-	if (getComputedStyle(div).display == "none") {
-		document.addEventListener("keydown", closeHelp);
-		div.querySelector(".dismiss").onclick = closeHelp; // avoid chaining on multiple showHelp() calls
-	}
+  if (getComputedStyle(div).display == "none") {
+    document.addEventListener("keydown", closeHelp);
+    div.querySelector(".dismiss").onclick = closeHelp; // avoid chaining on multiple showHelp() calls
+  }
 
-	div.style.display = "block";
-	return div;
+  div.style.display = "block";
+  return div;
 
-	function closeHelp(e) {
-		if (!e
-		|| e.type == "click"
-		|| ((e.keyCode || e.which) == 27 && !e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)) {
-			div.style.display = "";
-			document.querySelector(".contents").innerHTML = "";
-			document.removeEventListener("keydown", closeHelp);
-		}
-	}
+  function closeHelp(e) {
+    if (!e
+    || e.type == "click"
+    || ((e.keyCode || e.which) == 27 && !e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)) {
+      div.style.display = "";
+      document.querySelector(".contents").innerHTML = "";
+      document.removeEventListener("keydown", closeHelp);
+    }
+  }
 }
 
 function showCodeMirrorPopup(title, html, options) {
-	var popup = showHelp(title, html);
-	popup.classList.add("big");
+  var popup = showHelp(title, html);
+  popup.classList.add("big");
 
-	popup.codebox = CodeMirror(popup.querySelector(".contents"), Object.assign({
-		mode: "css",
-		lineNumbers: true,
-		lineWrapping: true,
-		foldGutter: true,
-		gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter", "CodeMirror-lint-markers"],
-		matchBrackets: true,
-		lint: {getAnnotations: CodeMirror.lint.css, delay: 0},
-		styleActiveLine: true,
-		theme: prefs.get("editor.theme"),
-		keyMap: prefs.get("editor.keyMap")
-	}, options));
-	popup.codebox.focus();
-	popup.codebox.on("focus", function() { hotkeyRerouter.setState(false) });
-	popup.codebox.on("blur", function() { hotkeyRerouter.setState(true) });
-	return popup;
+  popup.codebox = CodeMirror(popup.querySelector(".contents"), Object.assign({
+    mode: "css",
+    lineNumbers: true,
+    lineWrapping: true,
+    foldGutter: true,
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter", "CodeMirror-lint-markers"],
+    matchBrackets: true,
+    lint: {getAnnotations: CodeMirror.lint.css, delay: 0},
+    styleActiveLine: true,
+    theme: prefs.get("editor.theme"),
+    keyMap: prefs.get("editor.keyMap")
+  }, options));
+  popup.codebox.focus();
+  popup.codebox.on("focus", function() { hotkeyRerouter.setState(false) });
+  popup.codebox.on("blur", function() { hotkeyRerouter.setState(true) });
+  return popup;
 }
 
 function getParams() {
-	var params = {};
-	var urlParts = location.href.split("?", 2);
-	if (urlParts.length == 1) {
-		return params;
-	}
-	urlParts[1].split("&").forEach(function(keyValue) {
-		var splitKeyValue = keyValue.split("=", 2);
-		params[decodeURIComponent(splitKeyValue[0])] = decodeURIComponent(splitKeyValue[1]);
-	});
-	return params;
+  var params = {};
+  var urlParts = location.href.split("?", 2);
+  if (urlParts.length == 1) {
+    return params;
+  }
+  urlParts[1].split("&").forEach(function(keyValue) {
+    var splitKeyValue = keyValue.split("=", 2);
+    params[decodeURIComponent(splitKeyValue[0])] = decodeURIComponent(splitKeyValue[1]);
+  });
+  return params;
 }
 
 chrome.runtime.onMessage.addListener(onRuntimeMessage);
 
 function onRuntimeMessage(request) {
-	switch (request.method) {
-		case "styleUpdated":
-			if (styleId && styleId == request.style.id && request.reason != 'editSave') {
-				if ((request.style.sections[0] || {}).code === null) {
-					// the code-less style came from notifyAllTabs
-					onBackgroundReady().then(() => {
-						request.style = BG.cachedStyles.byId.get(request.style.id);
-						initWithStyle(request);
-					});
-				} else {
-					initWithStyle(request);
-				}
-			}
-			break;
-		case "styleDeleted":
-			if (styleId && styleId == request.id) {
-				window.onbeforeunload = function() {};
-				window.close();
-				break;
-			}
-			break;
-		case "prefChanged":
-			if ('editor.smartIndent' in request.prefs) {
-				CodeMirror.setOption('smartIndent', request.prefs['editor.smartIndent']);
-			}
-			break;
-		case 'editDeleteText':
-			document.execCommand('delete');
-			break;
-	}
+  switch (request.method) {
+    case "styleUpdated":
+      if (styleId && styleId == request.style.id && request.reason != 'editSave') {
+        if ((request.style.sections[0] || {}).code === null) {
+          // the code-less style came from notifyAllTabs
+          onBackgroundReady().then(() => {
+            request.style = BG.cachedStyles.byId.get(request.style.id);
+            initWithStyle(request);
+          });
+        } else {
+          initWithStyle(request);
+        }
+      }
+      break;
+    case "styleDeleted":
+      if (styleId && styleId == request.id) {
+        window.onbeforeunload = function() {};
+        window.close();
+        break;
+      }
+      break;
+    case "prefChanged":
+      if ('editor.smartIndent' in request.prefs) {
+        CodeMirror.setOption('smartIndent', request.prefs['editor.smartIndent']);
+      }
+      break;
+    case 'editDeleteText':
+      document.execCommand('delete');
+      break;
+  }
 }
 
 function getComputedHeight(el) {
-	var compStyle = getComputedStyle(el);
-	return el.getBoundingClientRect().height +
-		parseFloat(compStyle.marginTop) + parseFloat(compStyle.marginBottom);
+  var compStyle = getComputedStyle(el);
+  return el.getBoundingClientRect().height +
+    parseFloat(compStyle.marginTop) + parseFloat(compStyle.marginBottom);
 }
 
 
 function getCodeMirrorThemes() {
-	if (!chrome.runtime.getPackageDirectoryEntry) {
-		const themes = [
-			chrome.i18n.getMessage('defaultTheme'),
-			'3024-day',
-			'3024-night',
-			'abcdef',
-			'ambiance',
-			'ambiance-mobile',
-			'base16-dark',
-			'base16-light',
-			'bespin',
-			'blackboard',
-			'cobalt',
-			'colorforth',
-			'dracula',
-			'duotone-dark',
-			'duotone-light',
-			'eclipse',
-			'elegant',
-			'erlang-dark',
-			'hopscotch',
-			'icecoder',
-			'isotope',
-			'lesser-dark',
-			'liquibyte',
-			'material',
-			'mbo',
-			'mdn-like',
-			'midnight',
-			'monokai',
-			'neat',
-			'neo',
-			'night',
-			'panda-syntax',
-			'paraiso-dark',
-			'paraiso-light',
-			'pastel-on-dark',
-			'railscasts',
-			'rubyblue',
-			'seti',
-			'solarized',
-			'the-matrix',
-			'tomorrow-night-bright',
-			'tomorrow-night-eighties',
-			'ttcn',
-			'twilight',
-			'vibrant-ink',
-			'xq-dark',
-			'xq-light',
-			'yeti',
-			'zenburn',
-		];
-		localStorage.codeMirrorThemes = themes.join(' ');
-		return Promise.resolve(themes);
-	}
-	return new Promise(resolve => {
-		chrome.runtime.getPackageDirectoryEntry(rootDir => {
-			rootDir.getDirectory('vendor/codemirror/theme', {create: false}, themeDir => {
-				themeDir.createReader().readEntries(entries => {
-					const themes = [
-						chrome.i18n.getMessage('defaultTheme')
-					].concat(
-						entries.filter(entry => entry.isFile)
-							.sort((a, b) => (a.name < b.name ? -1 : 1))
-							.map(entry => entry.name.replace(/\.css$/, ''))
-					);
-					localStorage.codeMirrorThemes = themes.join(' ');
-					resolve(themes);
-				});
-			});
-		});
-	});
+  if (!chrome.runtime.getPackageDirectoryEntry) {
+    const themes = [
+      chrome.i18n.getMessage('defaultTheme'),
+      '3024-day',
+      '3024-night',
+      'abcdef',
+      'ambiance',
+      'ambiance-mobile',
+      'base16-dark',
+      'base16-light',
+      'bespin',
+      'blackboard',
+      'cobalt',
+      'colorforth',
+      'dracula',
+      'duotone-dark',
+      'duotone-light',
+      'eclipse',
+      'elegant',
+      'erlang-dark',
+      'hopscotch',
+      'icecoder',
+      'isotope',
+      'lesser-dark',
+      'liquibyte',
+      'material',
+      'mbo',
+      'mdn-like',
+      'midnight',
+      'monokai',
+      'neat',
+      'neo',
+      'night',
+      'panda-syntax',
+      'paraiso-dark',
+      'paraiso-light',
+      'pastel-on-dark',
+      'railscasts',
+      'rubyblue',
+      'seti',
+      'solarized',
+      'the-matrix',
+      'tomorrow-night-bright',
+      'tomorrow-night-eighties',
+      'ttcn',
+      'twilight',
+      'vibrant-ink',
+      'xq-dark',
+      'xq-light',
+      'yeti',
+      'zenburn',
+    ];
+    localStorage.codeMirrorThemes = themes.join(' ');
+    return Promise.resolve(themes);
+  }
+  return new Promise(resolve => {
+    chrome.runtime.getPackageDirectoryEntry(rootDir => {
+      rootDir.getDirectory('vendor/codemirror/theme', {create: false}, themeDir => {
+        themeDir.createReader().readEntries(entries => {
+          const themes = [
+            chrome.i18n.getMessage('defaultTheme')
+          ].concat(
+            entries.filter(entry => entry.isFile)
+              .sort((a, b) => (a.name < b.name ? -1 : 1))
+              .map(entry => entry.name.replace(/\.css$/, ''))
+          );
+          localStorage.codeMirrorThemes = themes.join(' ');
+          resolve(themes);
+        });
+      });
+    });
+  });
 }

From 0037c699d9fc2193ebd13a3ee53fb732aef76047 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Wed, 12 Jul 2017 15:44:59 -0500
Subject: [PATCH 76/94] Fix eslint issues

---
 edit/edit.js     | 993 ++++++++++++++++++++++++-----------------------
 js/dom.js        |   1 +
 manage/manage.js |  18 +-
 3 files changed, 526 insertions(+), 486 deletions(-)

diff --git a/edit/edit.js b/edit/edit.js
index 93c2ba4b..ed9dd8d6 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -1,23 +1,23 @@
-/* eslint no-tabs: 0, no-var: 0, indent-legacy: [2, tab, {VariableDeclarator: 0, SwitchCase: 1}], quotes: 0 */
-/* global CodeMirror */
-"use strict";
+/* eslint brace-style: 0, operator-linebreak: 0 */
+/* global CodeMirror exports parserlib CSSLint */
+'use strict';
 
-var styleId = null;
-var dirty = {};       // only the actually dirty items here
-var editors = [];     // array of all CodeMirror instances
-var saveSizeOnClose;
-var useHistoryBack;   // use browser history back when "back to manage" is clicked
+let styleId = null;
+let dirty = {};       // only the actually dirty items here
+const editors = [];     // array of all CodeMirror instances
+let saveSizeOnClose;
+let useHistoryBack;   // use browser history back when 'back to manage' is clicked
 
 // direct & reverse mapping of @-moz-document keywords and internal property names
-var propertyToCss = {urls: "url", urlPrefixes: "url-prefix", domains: "domain", regexps: "regexp"};
-var CssToProperty = {"url": "urls", "url-prefix": "urlPrefixes", "domain": "domains", "regexp": "regexps"};
+const propertyToCss = {urls: 'url', urlPrefixes: 'url-prefix', domains: 'domain', regexps: 'regexp'};
+const CssToProperty = {'url': 'urls', 'url-prefix': 'urlPrefixes', 'domain': 'domains', 'regexp': 'regexps'};
 
 // if background page hasn't been loaded yet, increase the chances it has before DOMContentLoaded
 onBackgroundReady();
 
 // make querySelectorAll enumeration code readable
-["forEach", "some", "indexOf", "map"].forEach(function(method) {
-  NodeList.prototype[method]= Array.prototype[method];
+['forEach', 'some', 'indexOf', 'map'].forEach(function(method) {
+  NodeList.prototype[method] = Array.prototype[method];
 });
 
 // Chrome pre-34
@@ -25,24 +25,28 @@ Element.prototype.matches = Element.prototype.matches || Element.prototype.webki
 
 // Chrome pre-41 polyfill
 Element.prototype.closest = Element.prototype.closest || function(selector) {
-  for (var e = this; e && !e.matches(selector); e = e.parentElement) {}
+  let e;
+  // eslint-disable-next-line no-empty
+  for (e = this; e && !e.matches(selector); e = e.parentElement) {}
   return e;
 };
 
+// eslint-disable-next-line no-extend-native
 Array.prototype.rotate = function(amount) { // negative amount == rotate left
-  var r = this.slice(-amount, this.length);
+  const r = this.slice(-amount, this.length);
   Array.prototype.push.apply(r, this.slice(0, this.length - r.length));
   return r;
 };
 
-Object.defineProperty(Array.prototype, "last", {get: function() { return this[this.length - 1]; }});
+// eslint-disable-next-line no-extend-native
+Object.defineProperty(Array.prototype, 'last', {get: function() { return this[this.length - 1]; }});
 
 // preload the theme so that CodeMirror can calculate its metrics in DOMContentLoaded->setupLivePrefs()
 new MutationObserver((mutations, observer) => {
-  const themeElement = document.getElementById("cm-theme");
+  const themeElement = document.getElementById('cm-theme');
   if (themeElement) {
-    themeElement.href = prefs.get("editor.theme") == "default" ? ""
-      : "vendor/codemirror/theme/" + prefs.get("editor.theme") + ".css";
+    themeElement.href = prefs.get('editor.theme') == 'default' ? ''
+      : 'vendor/codemirror/theme/' + prefs.get('editor.theme') + '.css';
     observer.disconnect();
   }
 }).observe(document, {subtree: true, childList: true});
@@ -50,7 +54,7 @@ new MutationObserver((mutations, observer) => {
 getCodeMirrorThemes();
 
 // reroute handling to nearest editor when keypress resolves to one of these commands
-var hotkeyRerouter = {
+const hotkeyRerouter = {
   commands: {
     save: true, jumpToLine: true, nextEditor: true, prevEditor: true,
     find: true, findNext: true, findPrev: true, replace: true, replaceAll: true,
@@ -58,13 +62,15 @@ var hotkeyRerouter = {
   },
   setState: function(enable) {
     setTimeout(function() {
-      document[(enable ? "add" : "remove") + "EventListener"]("keydown", hotkeyRerouter.eventHandler);
+      document[(enable ? 'add' : 'remove') + 'EventListener']('keydown', hotkeyRerouter.eventHandler);
     }, 0);
   },
   eventHandler: function(event) {
-    var keyName = CodeMirror.keyName(event);
-    if ("handled" == CodeMirror.lookupKey(keyName, CodeMirror.getOption("keyMap"), handleCommand)
-     || "handled" == CodeMirror.lookupKey(keyName, CodeMirror.defaults.extraKeys, handleCommand)) {
+    const keyName = CodeMirror.keyName(event);
+    if (
+      CodeMirror.lookupKey(keyName, CodeMirror.getOption('keyMap'), handleCommand) == 'handled' ||
+      CodeMirror.lookupKey(keyName, CodeMirror.defaults.extraKeys, handleCommand) == 'handled'
+    ) {
       event.preventDefault();
       event.stopPropagation();
     }
@@ -78,13 +84,13 @@ var hotkeyRerouter = {
 };
 
 function onChange(event) {
-  var node = event.target;
-  if ("savedValue" in node) {
-    var currentValue = "checkbox" === node.type ? node.checked : node.value;
+  const node = event.target;
+  if ('savedValue' in node) {
+    const currentValue = node.type === 'checkbox' ? node.checked : node.value;
     setCleanItem(node, node.savedValue === currentValue);
   } else {
     // the manually added section's applies-to is dirty only when the value is non-empty
-    setCleanItem(node, node.localName != "input" || !node.value.trim());
+    setCleanItem(node, node.localName != 'input' || !node.value.trim());
     delete node.savedValue; // only valid when actually saved
   }
   updateTitle();
@@ -92,7 +98,7 @@ function onChange(event) {
 
 // Set .dirty on stylesheet contributors that have changed
 function setDirtyClass(node, isDirty) {
-  node.classList.toggle("dirty", isDirty);
+  node.classList.toggle('dirty', isDirty);
 }
 
 function setCleanItem(node, isClean) {
@@ -106,7 +112,7 @@ function setCleanItem(node, isClean) {
     if (node.CodeMirror) {
       node.savedValue = node.CodeMirror.changeGeneration();
     } else {
-      node.savedValue = "checkbox" === node.type ? node.checked : node.value;
+      node.savedValue = node.type === 'checkbox' ? node.checked : node.value;
     }
   } else {
     dirty[node.id] = true;
@@ -116,27 +122,27 @@ function setCleanItem(node, isClean) {
 }
 
 function isCleanGlobal() {
-  var clean = Object.keys(dirty).length == 0;
+  const clean = Object.keys(dirty).length == 0;
   setDirtyClass(document.body, !clean);
-    var saveBtn = document.getElementById("save-button")
-    if (clean){
-        //saveBtn.removeAttribute('disabled');
-    }else{
-        //saveBtn.setAttribute('disabled', true);
-    }
+    // let saveBtn = document.getElementById('save-button')
+    // if (clean){
+    //     //saveBtn.removeAttribute('disabled');
+    // }else{
+    //     //saveBtn.setAttribute('disabled', true);
+    // }
   return clean;
 }
 
 function setCleanGlobal() {
-  document.querySelectorAll("#header, #sections > div").forEach(setCleanSection);
+  document.querySelectorAll('#header, #sections > div').forEach(setCleanSection);
   dirty = {}; // forget the dirty applies-to ids from a deleted section after the style was saved
 }
 
 function setCleanSection(section) {
-  section.querySelectorAll(".style-contributor").forEach(function(node) { setCleanItem(node, true) });
+  section.querySelectorAll('.style-contributor').forEach(function(node) { setCleanItem(node, true); });
 
   // #header section has no codemirror
-  var cm = section.CodeMirror;
+  const cm = section.CodeMirror;
   if (cm) {
     section.savedValue = cm.changeGeneration();
     indicateCodeChange(cm);
@@ -144,10 +150,10 @@ function setCleanSection(section) {
 }
 
 function initCodeMirror() {
-  var CM = CodeMirror;
-  var isWindowsOS = navigator.appVersion.indexOf("Windows") > 0;
+  const CM = CodeMirror;
+  const isWindowsOS = navigator.appVersion.indexOf('Windows') > 0;
 
-  // CodeMirror miserably fails on keyMap="" so let's ensure it's not
+  // CodeMirror miserably fails on keyMap='' so let's ensure it's not
   if (!prefs.get('editor.keyMap')) {
     prefs.reset('editor.keyMap');
   }
@@ -158,77 +164,77 @@ function initCodeMirror() {
     lineNumbers: true,
     lineWrapping: true,
     foldGutter: true,
-    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter", "CodeMirror-lint-markers"],
+    gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter', 'CodeMirror-lint-markers'],
     matchBrackets: true,
     highlightSelectionMatches: {showToken: /[#.\-\w]/, annotateScrollbar: true},
     hintOptions: {},
-    lint: {getAnnotations: CodeMirror.lint.css, delay: prefs.get("editor.lintDelay")},
-    lintReportDelay: prefs.get("editor.lintReportDelay"),
+    lint: {getAnnotations: CodeMirror.lint.css, delay: prefs.get('editor.lintDelay')},
+    lintReportDelay: prefs.get('editor.lintReportDelay'),
     styleActiveLine: true,
-    theme: "default",
-    keyMap: prefs.get("editor.keyMap"),
+    theme: 'default',
+    keyMap: prefs.get('editor.keyMap'),
     extraKeys: { // independent of current keyMap
-      "Alt-Enter": "toggleStyle",
-      "Alt-PageDown": "nextEditor",
-      "Alt-PageUp": "prevEditor"
+      'Alt-Enter': 'toggleStyle',
+      'Alt-PageDown': 'nextEditor',
+      'Alt-PageUp': 'prevEditor'
     }
-  }, prefs.get("editor.options"));
+  }, prefs.get('editor.options'));
 
   // additional commands
   CM.commands.jumpToLine = jumpToLine;
-  CM.commands.nextEditor = function(cm) { nextPrevEditor(cm, 1) };
-  CM.commands.prevEditor = function(cm) { nextPrevEditor(cm, -1) };
+  CM.commands.nextEditor = function(cm) { nextPrevEditor(cm, 1); };
+  CM.commands.prevEditor = function(cm) { nextPrevEditor(cm, -1); };
   CM.commands.save = save;
   CM.commands.blockComment = function(cm) {
-    cm.blockComment(cm.getCursor("from"), cm.getCursor("to"), {fullLines: false});
+    cm.blockComment(cm.getCursor('from'), cm.getCursor('to'), {fullLines: false});
   };
   CM.commands.toggleStyle = toggleStyle;
 
-  // "basic" keymap only has basic keys by design, so we skip it
+  // 'basic' keymap only has basic keys by design, so we skip it
 
-  var extraKeysCommands = {};
+  const extraKeysCommands = {};
   Object.keys(CM.defaults.extraKeys).forEach(function(key) {
     extraKeysCommands[CM.defaults.extraKeys[key]] = true;
   });
   if (!extraKeysCommands.jumpToLine) {
-    CM.keyMap.sublime["Ctrl-G"] = "jumpToLine";
-    CM.keyMap.emacsy["Ctrl-G"] = "jumpToLine";
-    CM.keyMap.pcDefault["Ctrl-J"] = "jumpToLine";
-    CM.keyMap.macDefault["Cmd-J"] = "jumpToLine";
+    CM.keyMap.sublime['Ctrl-G'] = 'jumpToLine';
+    CM.keyMap.emacsy['Ctrl-G'] = 'jumpToLine';
+    CM.keyMap.pcDefault['Ctrl-J'] = 'jumpToLine';
+    CM.keyMap.macDefault['Cmd-J'] = 'jumpToLine';
   }
   if (!extraKeysCommands.autocomplete) {
-    CM.keyMap.pcDefault["Ctrl-Space"] = "autocomplete"; // will be used by "sublime" on PC via fallthrough
-    CM.keyMap.macDefault["Alt-Space"] = "autocomplete"; // OSX uses Ctrl-Space and Cmd-Space for something else
-    CM.keyMap.emacsy["Alt-/"] = "autocomplete"; // copied from "emacs" keymap
-    // "vim" and "emacs" define their own autocomplete hotkeys
+    CM.keyMap.pcDefault['Ctrl-Space'] = 'autocomplete'; // will be used by 'sublime' on PC via fallthrough
+    CM.keyMap.macDefault['Alt-Space'] = 'autocomplete'; // OSX uses Ctrl-Space and Cmd-Space for something else
+    CM.keyMap.emacsy['Alt-/'] = 'autocomplete'; // copied from 'emacs' keymap
+    // 'vim' and 'emacs' define their own autocomplete hotkeys
   }
   if (!extraKeysCommands.blockComment) {
-    CM.keyMap.sublime["Shift-Ctrl-/"] = "blockComment";
+    CM.keyMap.sublime['Shift-Ctrl-/'] = 'blockComment';
   }
 
   if (isWindowsOS) {
-    // "pcDefault" keymap on Windows should have F3/Shift-F3
+    // 'pcDefault' keymap on Windows should have F3/Shift-F3
     if (!extraKeysCommands.findNext) {
-      CM.keyMap.pcDefault["F3"] = "findNext";
+      CM.keyMap.pcDefault['F3'] = 'findNext';
     }
     if (!extraKeysCommands.findPrev) {
-      CM.keyMap.pcDefault["Shift-F3"] = "findPrev";
+      CM.keyMap.pcDefault['Shift-F3'] = 'findPrev';
     }
 
     // try to remap non-interceptable Ctrl-(Shift-)N/T/W hotkeys
-    ["N", "T", "W"].forEach(function(char) {
-      [{from: "Ctrl-", to: ["Alt-", "Ctrl-Alt-"]},
-       {from: "Shift-Ctrl-", to: ["Ctrl-Alt-", "Shift-Ctrl-Alt-"]} // Note: modifier order in CM is S-C-A
+    ['N', 'T', 'W'].forEach(function(char) {
+      [{from: 'Ctrl-', to: ['Alt-', 'Ctrl-Alt-']},
+       {from: 'Shift-Ctrl-', to: ['Ctrl-Alt-', 'Shift-Ctrl-Alt-']} // Note: modifier order in CM is S-C-A
       ].forEach(function(remap) {
-        var oldKey = remap.from + char;
+        const oldKey = remap.from + char;
         Object.keys(CM.keyMap).forEach(function(keyMapName) {
-          var keyMap = CM.keyMap[keyMapName];
-          var command = keyMap[oldKey];
+          const keyMap = CM.keyMap[keyMapName];
+          const command = keyMap[oldKey];
           if (!command) {
             return;
           }
           remap.to.some(function(newMod) {
-            var newKey = newMod + char;
+            const newKey = newMod + char;
             if (!(newKey in keyMap)) {
               delete keyMap[oldKey];
               keyMap[newKey] = command;
@@ -241,10 +247,10 @@ function initCodeMirror() {
   }
 
   // user option values
-  CM.getOption = function (o) {
+  CM.getOption = function(o) {
     return CodeMirror.defaults[o];
   };
-  CM.setOption = function (o, v) {
+  CM.setOption = function(o, v) {
     CodeMirror.defaults[o] = v;
     editors.forEach(function(editor) {
       editor.setOption(o, v);
@@ -257,66 +263,67 @@ function initCodeMirror() {
 
   // initialize global editor controls
   function optionsHtmlFromArray(options) {
-    return options.map(function(opt) { return "<option>" + opt + "</option>"; }).join("");
+    return options.map(function(opt) { return '<option>' + opt + '</option>'; }).join('');
   }
-  var themeControl = document.getElementById("editor.theme");
+  const themeControl = document.getElementById('editor.theme');
   const themeList = localStorage.codeMirrorThemes;
   if (themeList) {
     themeControl.innerHTML = optionsHtmlFromArray(themeList.split(/\s+/));
   } else {
     // Chrome is starting up and shows our edit.html, but the background page isn't loaded yet
-    const theme = prefs.get("editor.theme");
-    themeControl.innerHTML = optionsHtmlFromArray([theme == "default" ? t("defaultTheme") : theme]);
+    const theme = prefs.get('editor.theme');
+    themeControl.innerHTML = optionsHtmlFromArray([theme == 'default' ? t('defaultTheme') : theme]);
     getCodeMirrorThemes().then(() => {
       const themes = (localStorage.codeMirrorThemes || '').split(/\s+/);
       themeControl.innerHTML = optionsHtmlFromArray(themes);
       themeControl.selectedIndex = Math.max(0, themes.indexOf(theme));
     });
   }
-  document.getElementById("editor.keyMap").innerHTML = optionsHtmlFromArray(Object.keys(CM.keyMap).sort());
-  document.getElementById("options").addEventListener("change", acmeEventListener, false);
+  document.getElementById('editor.keyMap').innerHTML = optionsHtmlFromArray(Object.keys(CM.keyMap).sort());
+  document.getElementById('options').addEventListener('change', acmeEventListener, false);
   setupLivePrefs();
 
   hotkeyRerouter.setState(true);
 }
 
 function acmeEventListener(event) {
-  var el = event.target;
-  var option = el.id.replace(/^editor\./, '');
-  //console.log("acmeEventListener heard %s on %s", event.type, el.id);
+  const el = event.target;
+  const option = el.id.replace(/^editor\./, '');
+  //console.log('acmeEventListener heard %s on %s', event.type, el.id);
   if (!option) {
-    console.error("acmeEventListener: no 'cm_option' %O", el);
+    console.error('acmeEventListener: no "cm_option" %O', el);
     return;
   }
-  var value = el.type == "checkbox" ? el.checked : el.value;
+  let value = el.type == 'checkbox' ? el.checked : el.value;
+  let url;
+  const themeLink = document.getElementById('cm-theme');
   switch (option) {
-    case "tabSize":
-      CodeMirror.setOption("indentUnit", Number(value));
+    case 'tabSize':
+      CodeMirror.setOption('indentUnit', Number(value));
       break;
-    case "theme":
-      var themeLink = document.getElementById("cm-theme");
-      // use non-localized "default" internally
-      if (!value || value == "default" || value == t("defaultTheme")) {
-        value = "default";
+    case 'theme':
+      // use non-localized 'default' internally
+      if (!value || value == 'default' || value == t('defaultTheme')) {
+        value = 'default';
         if (prefs.get(el.id) != value) {
           prefs.set(el.id, value);
         }
-        themeLink.href = "";
+        themeLink.href = '';
         el.selectedIndex = 0;
         break;
       }
-      var url = chrome.runtime.getURL("vendor/codemirror/theme/" + value + ".css");
+      url = chrome.runtime.getURL('vendor/codemirror/theme/' + value + '.css');
       if (themeLink.href == url) { // preloaded in initCodeMirror()
         break;
       }
       // avoid flicker: wait for the second stylesheet to load, then apply the theme
-      document.head.insertAdjacentHTML("beforeend",
+      document.head.insertAdjacentHTML('beforeend',
         '<link id="cm-theme2" rel="stylesheet" href="' + url + '">');
       (function() {
         setTimeout(function() {
           CodeMirror.setOption(option, value);
           themeLink.remove();
-          document.getElementById("cm-theme2").id = "cm-theme";
+          document.getElementById('cm-theme2').id = 'cm-theme';
         }, 100);
       })();
       return;
@@ -327,7 +334,7 @@ function acmeEventListener(event) {
         cm[onOff]('pick', autocompletePicked);
       });
       return;
-    case "matchHighlight":
+    case 'matchHighlight':
       switch (value) {
         case 'token':
         case 'selection':
@@ -377,9 +384,9 @@ function setupCodeMirror(textarea, index) {
       return;
     }
     lastClickTime = Date.now();
-    const minHeight = cm.defaultTextHeight()
-      + cm.display.lineDiv.offsetParent.offsetTop /* .CodeMirror-lines padding */
-      + wrapper.offsetHeight - wrapper.clientHeight /* borders */;
+    const minHeight = cm.defaultTextHeight() +
+      cm.display.lineDiv.offsetParent.offsetTop + /* .CodeMirror-lines padding */
+      wrapper.offsetHeight - wrapper.clientHeight; /* borders */
     wrapper.style.pointerEvents = 'none';
     document.body.style.cursor = 's-resize';
     function resize(e) {
@@ -403,29 +410,29 @@ function setupCodeMirror(textarea, index) {
 }
 
 function indicateCodeChange(cm) {
-  var section = cm.getSection();
+  const section = cm.getSection();
   setCleanItem(section, cm.isClean(section.savedValue));
   updateTitle();
   updateLintReport(cm);
 }
 
 function getSectionForChild(e) {
-  return e.closest("#sections > div");
+  return e.closest('#sections > div');
 }
 
 function getSections() {
-  return document.querySelectorAll("#sections > div");
+  return document.querySelectorAll('#sections > div');
 }
 
 // remind Chrome to repaint a previously invisible editor box by toggling any element's transform
 // this bug is present in some versions of Chrome (v37-40 or something)
-document.addEventListener("scroll", function(event) {
-  var style = document.getElementById("name").style;
-  style.webkitTransform = style.webkitTransform ? "" : "scale(1)";
+document.addEventListener('scroll', function() {
+  const style = document.getElementById('name').style;
+  style.webkitTransform = style.webkitTransform ? '' : 'scale(1)';
 });
 
 // Shift-Ctrl-Wheel scrolls entire page even when mouse is over a code editor
-document.addEventListener("wheel", function(event) {
+document.addEventListener('wheel', function(event) {
   if (event.shiftKey && event.ctrlKey && !event.altKey && !event.metaKey) {
     // Chrome scrolls horizontally when Shift is pressed but on some PCs this might be different
     window.scrollBy(0, event.deltaX || event.deltaY);
@@ -434,8 +441,8 @@ document.addEventListener("wheel", function(event) {
 });
 
 queryTabs({currentWindow: true}).then(tabs => {
-  var windowId = tabs[0].windowId;
-  if (prefs.get("openEditInWindow")) {
+  const windowId = tabs[0].windowId;
+  if (prefs.get('openEditInWindow')) {
     if (sessionStorage.saveSizeOnClose
     && 'left' in prefs.get('windowPosition', {})
     && !isWindowMaximized()) {
@@ -445,24 +452,24 @@ queryTabs({currentWindow: true}).then(tabs => {
     if (tabs.length == 1 && window.history.length == 1) {
       chrome.windows.getAll(function(windows) {
         if (windows.length > 1) {
-          sessionStorageHash("saveSizeOnClose").set(windowId, true);
+          sessionStorageHash('saveSizeOnClose').set(windowId, true);
           saveSizeOnClose = true;
         }
       });
     } else {
-      saveSizeOnClose = sessionStorageHash("saveSizeOnClose").value[windowId];
+      saveSizeOnClose = sessionStorageHash('saveSizeOnClose').value[windowId];
     }
   }
   chrome.tabs.onRemoved.addListener(function(tabId, info) {
-    sessionStorageHash("manageStylesHistory").unset(tabId);
+    sessionStorageHash('manageStylesHistory').unset(tabId);
     if (info.windowId == windowId && info.isWindowClosing) {
-      sessionStorageHash("saveSizeOnClose").unset(windowId);
+      sessionStorageHash('saveSizeOnClose').unset(windowId);
     }
   });
 });
 
 getActiveTab().then(tab => {
-  useHistoryBack = sessionStorageHash("manageStylesHistory").value[tab.id] == location.href;
+  useHistoryBack = sessionStorageHash('manageStylesHistory').value[tab.id] == location.href;
 });
 
 function goBackToManage(event) {
@@ -483,8 +490,8 @@ function isWindowMaximized() {
 }
 
 window.onbeforeunload = function() {
-  if (saveSizeOnClose	&& !isWindowMaximized()) {
-    prefs.set("windowPosition", {
+  if (saveSizeOnClose && !isWindowMaximized()) {
+    prefs.set('windowPosition', {
       left: screenLeft,
       top: screenTop,
       width: outerWidth,
@@ -500,44 +507,47 @@ window.onbeforeunload = function() {
 };
 
 function addAppliesTo(list, name, value) {
-  var showingEverything = list.querySelector(".applies-to-everything") != null;
-  // blow away "Everything" if it's there
+  const showingEverything = list.querySelector('.applies-to-everything') !== null;
+  // blow away 'Everything' if it's there
   if (showingEverything) {
     list.removeChild(list.firstChild);
   }
-  var e;
+  let e;
   if (name && value) {
     e = template.appliesTo.cloneNode(true);
-    e.querySelector("[name=applies-type]").value = name;
-    e.querySelector("[name=applies-value]").value = value;
-    e.querySelector(".remove-applies-to").addEventListener("click", removeAppliesTo, false);
+    e.querySelector('[name=applies-type]').value = name;
+    e.querySelector('[name=applies-value]').value = value;
+    e.querySelector('.remove-applies-to').addEventListener('click', removeAppliesTo, false);
   } else if (showingEverything || list.hasChildNodes()) {
     e = template.appliesTo.cloneNode(true);
     if (list.hasChildNodes()) {
-      e.querySelector("[name=applies-type]").value = list.querySelector("li:last-child [name='applies-type']").value;
+      e.querySelector('[name=applies-type]').value = list.querySelector('li:last-child [name="applies-type"]').value;
     }
-    e.querySelector(".remove-applies-to").addEventListener("click", removeAppliesTo, false);
+    e.querySelector('.remove-applies-to').addEventListener('click', removeAppliesTo, false);
   } else {
     e = template.appliesToEverything.cloneNode(true);
   }
-  e.querySelector(".add-applies-to").addEventListener("click", function() {addAppliesTo(this.parentNode.parentNode)}, false);
+  e.querySelector('.add-applies-to').addEventListener('click', function() {
+    addAppliesTo(this.parentNode.parentNode);
+  }, false);
   list.appendChild(e);
 }
 
 function addSection(event, section) {
-  var div = template.section.cloneNode(true);
-  div.querySelector(".applies-to-help").addEventListener("click", showAppliesToHelp, false);
-  div.querySelector(".remove-section").addEventListener("click", removeSection, false);
-  div.querySelector(".add-section").addEventListener("click", addSection, false);
-  div.querySelector(".beautify-section").addEventListener("click", beautify);
+  const div = template.section.cloneNode(true);
+  div.querySelector('.applies-to-help').addEventListener('click', showAppliesToHelp, false);
+  div.querySelector('.remove-section').addEventListener('click', removeSection, false);
+  div.querySelector('.add-section').addEventListener('click', addSection, false);
+  div.querySelector('.beautify-section').addEventListener('click', beautify);
 
-  var codeElement = div.querySelector(".code");
-  var appliesTo = div.querySelector(".applies-to-list");
-  var appliesToAdded = false;
+  const codeElement = div.querySelector('.code');
+  const appliesTo = div.querySelector('.applies-to-list');
+  let appliesToAdded = false;
 
   if (section) {
     codeElement.value = section.code;
-    for (var i in propertyToCss) {
+    let i;
+    for (i in propertyToCss) {
       if (section[i]) {
         section[i].forEach(function(url) {
           addAppliesTo(appliesTo, propertyToCss[i], url);
@@ -550,8 +560,8 @@ function addSection(event, section) {
     addAppliesTo(appliesTo);
   }
 
-  appliesTo.addEventListener("change", onChange);
-  appliesTo.addEventListener("input", onChange);
+  appliesTo.addEventListener('change', onChange);
+  appliesTo.addEventListener('input', onChange);
 
   toggleTestRegExpVisibility();
   appliesTo.addEventListener('change', toggleTestRegExpVisibility);
@@ -570,18 +580,19 @@ function addSection(event, section) {
     });
   }
 
-  var sections = document.getElementById("sections");
+  const sections = document.getElementById('sections');
+  let cm;
   if (event) {
-    var clickedSection = getSectionForChild(event.target);
+    const clickedSection = getSectionForChild(event.target);
     sections.insertBefore(div, clickedSection.nextElementSibling);
-    var newIndex = getSections().indexOf(clickedSection) + 1;
-    var cm = setupCodeMirror(codeElement, newIndex);
+    const newIndex = getSections().indexOf(clickedSection) + 1;
+    cm = setupCodeMirror(codeElement, newIndex);
     makeSectionVisible(cm);
-    cm.focus()
+    cm.focus();
     renderLintReport();
   } else {
     sections.appendChild(div);
-    var cm = setupCodeMirror(codeElement);
+    cm = setupCodeMirror(codeElement);
   }
 
   div.CodeMirror = cm;
@@ -590,8 +601,8 @@ function addSection(event, section) {
 }
 
 function removeAppliesTo(event) {
-  var appliesTo = event.target.parentNode,
-      appliesToList = appliesTo.parentNode;
+  const appliesTo = event.target.parentNode,
+    appliesToList = appliesTo.parentNode;
   removeAreaAndSetDirty(appliesTo);
   if (!appliesToList.hasChildNodes()) {
     addAppliesTo(appliesToList);
@@ -599,16 +610,16 @@ function removeAppliesTo(event) {
 }
 
 function removeSection(event) {
-  var section = getSectionForChild(event.target);
-  var cm = section.CodeMirror;
+  const section = getSectionForChild(event.target);
+  const cm = section.CodeMirror;
   removeAreaAndSetDirty(section);
   editors.splice(editors.indexOf(cm), 1);
   renderLintReport();
 }
 
 function removeAreaAndSetDirty(area) {
-  var contributors = area.querySelectorAll('.style-contributor');
-  if(!contributors.length){
+  const contributors = area.querySelectorAll('.style-contributor');
+  if (!contributors.length) {
     setCleanItem(area, false);
   }
   contributors.some(function(node) {
@@ -627,9 +638,12 @@ function removeAreaAndSetDirty(area) {
 }
 
 function makeSectionVisible(cm) {
-  var section = cm.getSection();
-  var bounds = section.getBoundingClientRect();
-  if ((bounds.bottom > window.innerHeight && bounds.top > 0) || (bounds.top < 0 && bounds.bottom < window.innerHeight)) {
+  const section = cm.getSection();
+  const bounds = section.getBoundingClientRect();
+  if (
+    (bounds.bottom > window.innerHeight && bounds.top > 0) ||
+    (bounds.top < 0 && bounds.bottom < window.innerHeight)
+  ) {
     if (bounds.top < 0) {
       window.scrollBy(0, bounds.top - 1);
     } else {
@@ -639,19 +653,19 @@ function makeSectionVisible(cm) {
 }
 
 function setupGlobalSearch() {
-  var originalCommand = {
+  const originalCommand = {
     find: CodeMirror.commands.find,
     findNext: CodeMirror.commands.findNext,
     findPrev: CodeMirror.commands.findPrev,
     replace: CodeMirror.commands.replace
   };
-  var originalOpenDialog = CodeMirror.prototype.openDialog;
-  var originalOpenConfirm = CodeMirror.prototype.openConfirm;
+  const originalOpenDialog = CodeMirror.prototype.openDialog;
+  const originalOpenConfirm = CodeMirror.prototype.openConfirm;
 
-  var curState; // cm.state.search for last used 'find'
+  let curState; // cm.state.search for last used 'find'
 
   function shouldIgnoreCase(query) { // treat all-lowercase non-regexp queries as case-insensitive
-    return typeof query == "string" && query == query.toLowerCase();
+    return typeof query == 'string' && query == query.toLowerCase();
   }
 
   function updateState(cm, newState) {
@@ -668,7 +682,7 @@ function setupGlobalSearch() {
       query: newState.query,
       overlay: newState.overlay,
       annotate: cm.showMatchesOnScrollbar(newState.query, shouldIgnoreCase(newState.query))
-    }
+    };
     cm.addOverlay(newState.overlay);
     return cm.state.search;
   }
@@ -685,12 +699,11 @@ function setupGlobalSearch() {
 
   function focusClosestCM(activeCM) {
     editors.lastActive = activeCM;
-    var cm = getEditorInSight();
+    const cm = getEditorInSight();
     if (cm != activeCM) {
       cm.focus();
     }
     return cm;
-
   }
 
   function find(activeCM) {
@@ -703,7 +716,7 @@ function setupGlobalSearch() {
       }
       editors.forEach(function(cm) {
         if (cm != activeCM) {
-          cm.execCommand("clearSearch");
+          cm.execCommand('clearSearch');
           updateState(cm, curState);
         }
       });
@@ -715,27 +728,27 @@ function setupGlobalSearch() {
   }
 
   function findNext(activeCM, reverse) {
-    var state = updateState(activeCM);
+    let state = updateState(activeCM);
     if (!state || !state.query) {
       find(activeCM);
       return;
     }
-    var pos = activeCM.getCursor(reverse ? "from" : "to");
+    let pos = activeCM.getCursor(reverse ? 'from' : 'to');
     activeCM.setSelection(activeCM.getCursor()); // clear the selection, don't move the cursor
 
-    var rxQuery = typeof state.query == "object"
-      ? state.query : stringAsRegExp(state.query, shouldIgnoreCase(state.query) ? "i" : "");
+    const rxQuery = typeof state.query == 'object'
+      ? state.query : stringAsRegExp(state.query, shouldIgnoreCase(state.query) ? 'i' : '');
 
-    if (document.activeElement && document.activeElement.name == "applies-value"
+    if (document.activeElement && document.activeElement.name == 'applies-value'
       && searchAppliesTo(activeCM)) {
       return;
     }
-    for (var i=0, cm=activeCM; i < editors.length; i++) {
+    for (let i = 0, cm = activeCM; i < editors.length; i++) {
       state = updateState(cm);
       if (!cm.hasFocus()) {
         pos = reverse ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(0, 0);
       }
-      var searchCursor = cm.getSearchCursor(state.query, pos, shouldIgnoreCase(state.query));
+      const searchCursor = cm.getSearchCursor(state.query, pos, shouldIgnoreCase(state.query));
       if (searchCursor.find(reverse)) {
         if (editors.length > 1) {
           makeSectionVisible(cm);
@@ -744,7 +757,7 @@ function setupGlobalSearch() {
         // speedup the original findNext
         state.posFrom = reverse ? searchCursor.to() : searchCursor.from();
         state.posTo = CodeMirror.Pos(state.posFrom.line, state.posFrom.ch);
-        originalCommand[reverse ? "findPrev" : "findNext"](cm);
+        originalCommand[reverse ? 'findPrev' : 'findNext'](cm);
         return;
       } else if (!reverse && searchAppliesTo(cm)) {
         return;
@@ -755,24 +768,24 @@ function setupGlobalSearch() {
       }
     }
     // nothing found so far, so call the original search with wrap-around
-    originalCommand[reverse ? "findPrev" : "findNext"](activeCM);
+    originalCommand[reverse ? 'findPrev' : 'findNext'](activeCM);
 
     function searchAppliesTo(cm) {
-      var inputs = [].slice.call(cm.getSection().querySelectorAll(".applies-value"));
+      let inputs = [].slice.call(cm.getSection().querySelectorAll('.applies-value'));
       if (reverse) {
         inputs = inputs.reverse();
       }
       inputs.splice(0, inputs.indexOf(document.activeElement) + 1);
       return inputs.some(function(input) {
-        var match = rxQuery.exec(input.value);
+        const match = rxQuery.exec(input.value);
         if (match) {
           input.focus();
-          var end = match.index + match[0].length;
+          const end = match.index + match[0].length;
           // scroll selected part into view in long inputs,
           // works only outside of current event handlers chain, hence timeout=0
           setTimeout(function() {
             input.setSelectionRange(end, end);
-            input.setSelectionRange(match.index, end)
+            input.setSelectionRange(match.index, end);
           }, 0);
           return true;
         }
@@ -785,21 +798,25 @@ function setupGlobalSearch() {
   }
 
   function replace(activeCM, all) {
-    var queue, query, replacement;
+    let queue, query, replacement;
     activeCM = focusClosestCM(activeCM);
-    customizeOpenDialog(activeCM, template[all ? "replaceAll" : "replace"], function(txt) {
+    customizeOpenDialog(activeCM, template[all ? 'replaceAll' : 'replace'], function(txt) {
       query = txt;
       customizeOpenDialog(activeCM, template.replaceWith, function(txt) {
         replacement = txt;
         queue = editors.rotate(-editors.indexOf(activeCM));
-        all ? editors.forEach(doReplace) : doReplace();
+        if (all) {
+          editors.forEach(doReplace);
+        } else {
+          doReplace();
+        }
       });
       this(query);
     });
     originalCommand.replace(activeCM, all);
 
     function doReplace() {
-      var cm = queue.shift();
+      const cm = queue.shift();
       if (!cm) {
         if (!all) {
           editors.lastActive.focus();
@@ -815,7 +832,7 @@ function setupGlobalSearch() {
           } else {
             doConfirm(cm);
             callback(replacement);
-            if (!cm.getWrapperElement().querySelector(".CodeMirror-dialog")) {
+            if (!cm.getWrapperElement().querySelector('.CodeMirror-dialog')) {
               // no dialog == nothing found in the current CM, move to the next
               doReplace();
             }
@@ -826,28 +843,28 @@ function setupGlobalSearch() {
       originalCommand.replace(cm, all);
     }
     function doConfirm(cm) {
-      var wrapAround = false;
-      var origPos = cm.getCursor();
+      let wrapAround = false;
+      const origPos = cm.getCursor();
       cm.openConfirm = function overrideConfirm(tmpl, callbacks, opt) {
-        var ovrCallbacks = callbacks.map(function(callback) {
+        const ovrCallbacks = callbacks.map(function(callback) {
           return function() {
             makeSectionVisible(cm);
             cm.openConfirm = overrideConfirm;
             setTimeout(function() { cm.openConfirm = originalOpenConfirm; }, 0);
 
-            var pos = cm.getCursor();
+            const pos = cm.getCursor();
             callback();
-            var cmp = CodeMirror.cmpPos(cm.getCursor(), pos);
+            const cmp = CodeMirror.cmpPos(cm.getCursor(), pos);
             wrapAround |= cmp <= 0;
 
-            var dlg = cm.getWrapperElement().querySelector(".CodeMirror-dialog");
+            const dlg = cm.getWrapperElement().querySelector('.CodeMirror-dialog');
             if (!dlg || cmp == 0 || wrapAround && CodeMirror.cmpPos(cm.getCursor(), origPos) >= 0) {
               if (dlg) {
                 dlg.remove();
               }
               doReplace();
             }
-          }
+          };
         });
         originalOpenConfirm.call(cm, template.replaceConfirm.innerHTML, ovrCallbacks, opt);
       };
@@ -866,14 +883,14 @@ function setupGlobalSearch() {
 }
 
 function jumpToLine(cm) {
-  var cur = cm.getCursor();
+  const cur = cm.getCursor();
   refocusMinidialog(cm);
   cm.openDialog(template.jumpToLine.innerHTML, function(str) {
-    var m = str.match(/^\s*(\d+)(?:\s*:\s*(\d+))?\s*$/);
+    const m = str.match(/^\s*(\d+)(?:\s*:\s*(\d+))?\s*$/);
     if (m) {
       cm.setCursor(m[1] - 1, m[2] ? m[2] - 1 : cur.ch);
     }
-  }, {value: cur.line+1});
+  }, {value: cur.line + 1});
 }
 
 function toggleStyle() {
@@ -903,9 +920,11 @@ function toggleSectionHeight(cm) {
 }
 
 function autocompleteOnTyping(cm, info, debounced) {
-  if (cm.state.completionActive
-  || info.origin && !info.origin.includes('input')
-  || !info.text.last) {
+  if (
+    cm.state.completionActive ||
+    info.origin && !info.origin.includes('input') ||
+    !info.text.last
+  ) {
     return;
   }
   if (cm.state.autocompletePicked) {
@@ -931,15 +950,15 @@ function autocompletePicked(cm) {
 }
 
 function refocusMinidialog(cm) {
-  var section = cm.getSection();
-  if (!section.querySelector(".CodeMirror-dialog")) {
+  const section = cm.getSection();
+  if (!section.querySelector('.CodeMirror-dialog')) {
     return;
   }
   // close the currently opened minidialog
   cm.focus();
   // make sure to focus the input in newly opened minidialog
   setTimeout(function() {
-    section.querySelector(".CodeMirror-dialog").focus();
+    section.querySelector('.CodeMirror-dialog').focus();
   }, 0);
 }
 
@@ -951,26 +970,26 @@ function nextPrevEditor(cm, direction) {
 
 function getEditorInSight(nearbyElement) {
   // priority: 1. associated CM for applies-to element 2. last active if visible 3. first visible
-  var cm;
-  if (nearbyElement && nearbyElement.className.indexOf("applies-") >= 0) {
+  let cm;
+  if (nearbyElement && nearbyElement.className.indexOf('applies-') >= 0) {
     cm = getSectionForChild(nearbyElement).CodeMirror;
   } else {
     cm = editors.lastActive;
   }
   if (!cm || offscreenDistance(cm) > 0) {
-    var sorted = editors
-      .map(function(cm, index) { return {cm: cm, distance: offscreenDistance(cm), index: index} })
-      .sort(function(a, b) { return a.distance - b.distance || a.index - b.index });
+    const sorted = editors
+      .map(function(cm, index) { return {cm: cm, distance: offscreenDistance(cm), index: index}; })
+      .sort(function(a, b) { return a.distance - b.distance || a.index - b.index; });
     cm = sorted[0].cm;
     if (sorted[0].distance > 0) {
-      makeSectionVisible(cm)
+      makeSectionVisible(cm);
     }
   }
   return cm;
 
   function offscreenDistance(cm) {
-    var LINES_VISIBLE = 2; // closest editor should have at least # lines visible
-    var bounds = cm.getSection().getBoundingClientRect();
+    const LINES_VISIBLE = 2; // closest editor should have at least # lines visible
+    const bounds = cm.getSection().getBoundingClientRect();
     if (bounds.top < 0) {
       return -bounds.top;
     } else if (bounds.top < window.innerHeight - cm.defaultTextHeight() * LINES_VISIBLE) {
@@ -988,10 +1007,10 @@ function updateLintReport(cm, delay) {
     return;
   }
   if (delay > 0) {
-    setTimeout(cm => { cm.performLint(); update(cm) }, delay, cm);
+    setTimeout(cm => { cm.performLint(); update(cm); }, delay, cm);
     return;
   }
-  var state = cm.state.lint;
+  const state = cm.state.lint;
   if (!state) {
     return;
   }
@@ -999,37 +1018,38 @@ function updateLintReport(cm, delay) {
   // or update it as soon as possible (default: 500ms lint + 100ms) in case an existing issue was just fixed
   clearTimeout(state.reportTimeout);
   state.reportTimeout = setTimeout(update, state.options.delay + 100, cm);
-  state.postponeNewIssues = delay == undefined || delay == null;
+  state.postponeNewIssues = delay == undefined || delay === null;
 
   function update(cm) {
-    var scope = cm ? [cm] : editors;
-    var changed = false;
-    var fixedOldIssues = false;
+    const scope = cm ? [cm] : editors;
+    let changed = false;
+    let fixedOldIssues = false;
+    let state;
     scope.forEach(function(cm) {
-      var state = cm.state.lint || {};
-      var oldMarkers = state.markedLast || {};
-      var newMarkers = {};
-      var html = !state.marked || state.marked.length == 0 ? "" : "<tbody>" +
+      state = cm.state.lint || {};
+      const oldMarkers = state.markedLast || {};
+      const newMarkers = {};
+      const html = !state.marked || state.marked.length == 0 ? '' : '<tbody>' +
         state.marked.map(function(mark) {
-          var info = mark.__annotation;
-          var isActiveLine = info.from.line == cm.getCursor().line;
-          var pos = isActiveLine ? "cursor" : (info.from.line + "," + info.from.ch);
-          var message = escapeHtml(info.message.replace(/ at line \d.+$/, ""));
+          const info = mark.__annotation;
+          const isActiveLine = info.from.line == cm.getCursor().line;
+          const pos = isActiveLine ? 'cursor' : (info.from.line + ',' + info.from.ch);
+          let message = escapeHtml(info.message.replace(/ at line \d.+$/, ''));
           if (message.length > 100) {
-            message = message.substr(0, 100) + "...";
+            message = message.substr(0, 100) + '...';
           }
           if (isActiveLine || oldMarkers[pos] == message) {
             delete oldMarkers[pos];
           }
           newMarkers[pos] = message;
-          return "<tr class='" + info.severity + "'>" +
-            "<td role='severity' class='CodeMirror-lint-marker-" + info.severity + "'>" +
-              info.severity + "</td>" +
-            "<td role='line'>" + (info.from.line+1) + "</td>" +
-            "<td role='sep'>:</td>" +
-            "<td role='col'>" + (info.from.ch+1) + "</td>" +
-            "<td role='message'>" + message + "</td></tr>";
-        }).join("") + "</tbody>";
+          return '<tr class="' + info.severity + '">' +
+            '<td role="severity" class="CodeMirror-lint-marker-' + info.severity + '">' +
+              info.severity + '</td>' +
+            '<td role="line">' + (info.from.line + 1) + '</td>' +
+            '<td role="sep">:</td>' +
+            '<td role="col">' + (info.from.ch + 1) + '</td>' +
+            '<td role="message">' + message + '</td></tr>';
+        }).join('') + '</tbody>';
       state.markedLast = newMarkers;
       fixedOldIssues |= state.reportDisplayed && Object.keys(oldMarkers).length > 0;
       if (state.html != html) {
@@ -1049,27 +1069,27 @@ function updateLintReport(cm, delay) {
     }
   }
   function escapeHtml(html) {
-    var chars = {"&": "&amp;", "<": "&lt;", ">": "&gt;", '"': '&quot;', "'": '&#39;', "/": '&#x2F;'};
-    return html.replace(/[&<>"'\/]/g, function(char) { return chars[char] });
+    const chars = {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', '\'': '&#39;', '/': '&#x2F;'};
+    return html.replace(/[&<>"'/]/g, function(char) { return chars[char]; });
   }
 }
 
 function renderLintReport(someBlockChanged) {
-  var container = document.getElementById("lint");
-  var content = container.children[1];
-  var label = t("sectionCode");
-  var newContent = content.cloneNode(false);
-  var issueCount = 0;
+  const container = document.getElementById('lint');
+  const content = container.children[1];
+  const label = t('sectionCode');
+  const newContent = content.cloneNode(false);
+  let issueCount = 0;
   editors.forEach(function(cm, index) {
     if (cm.state.lint && cm.state.lint.html) {
-      var newBlock = newContent.appendChild(document.createElement("table"));
-      var html = "<caption>" + label + " " + (index+1) + "</caption>" + cm.state.lint.html;
+      const newBlock = newContent.appendChild(document.createElement('table'));
+      const html = '<caption>' + label + ' ' + (index + 1) + '</caption>' + cm.state.lint.html;
       newBlock.innerHTML = html;
       newBlock.cm = cm;
       issueCount += newBlock.rows.length;
 
-      var block = content.children[newContent.children.length - 1];
-      var blockChanged = !block || cm != block.cm || html != block.innerHTML;
+      const block = content.children[newContent.children.length - 1];
+      const blockChanged = !block || cm != block.cm || html != block.innerHTML;
       someBlockChanged |= blockChanged;
       cm.state.lint.reportDisplayed = blockChanged;
     }
@@ -1077,16 +1097,16 @@ function renderLintReport(someBlockChanged) {
   if (someBlockChanged || newContent.children.length != content.children.length) {
     document.getElementById('issue-count').textContent = issueCount;
     container.replaceChild(newContent, content);
-    container.style.display = newContent.children.length ? "block" : "none";
+    container.style.display = newContent.children.length ? 'block' : 'none';
     resizeLintReport(null, newContent);
   }
 }
 
 function resizeLintReport(event, content) {
-  content = content || document.getElementById("lint").children[1];
+  content = content || document.getElementById('lint').children[1];
   if (content.children.length) {
-    var bounds = content.getBoundingClientRect();
-    var newMaxHeight = bounds.bottom <= innerHeight ? '' : (innerHeight - bounds.top) + "px";
+    const bounds = content.getBoundingClientRect();
+    const newMaxHeight = bounds.bottom <= innerHeight ? '' : (innerHeight - bounds.top) + 'px';
     if (newMaxHeight != content.style.maxHeight) {
       content.style.maxHeight = newMaxHeight;
     }
@@ -1094,57 +1114,57 @@ function resizeLintReport(event, content) {
 }
 
 function gotoLintIssue(event) {
-  var issue = event.target.closest("tr");
+  const issue = event.target.closest('tr');
   if (!issue) {
     return;
   }
-  var block = issue.closest("table");
+  const block = issue.closest('table');
   makeSectionVisible(block.cm);
   block.cm.focus();
   block.cm.setSelection({
-    line: parseInt(issue.querySelector("td[role='line']").textContent) - 1,
-    ch: parseInt(issue.querySelector("td[role='col']").textContent) - 1
+    line: parseInt(issue.querySelector('td[role="line"]').textContent) - 1,
+    ch: parseInt(issue.querySelector('td[role="col"]').textContent) - 1
   });
 }
 
 function toggleLintReport() {
-  document.getElementById("lint").classList.toggle("collapsed");
+  document.getElementById('lint').classList.toggle('collapsed');
 }
 
 function beautify(event) {
   if (exports.css_beautify) { // thanks to csslint's definition of 'exports'
     doBeautify();
   } else {
-    var script = document.head.appendChild(document.createElement("script"));
-    script.src = "vendor-overwrites/beautify/beautify-css-mod.js";
+    const script = document.head.appendChild(document.createElement('script'));
+    script.src = 'vendor-overwrites/beautify/beautify-css-mod.js';
     script.onload = doBeautify;
   }
   function doBeautify() {
-    var tabs = prefs.get("editor.indentWithTabs");
-    var options = prefs.get("editor.beautify");
-    options.indent_size = tabs ? 1 : prefs.get("editor.tabSize");
-    options.indent_char = tabs ? "\t" : " ";
+    const tabs = prefs.get('editor.indentWithTabs');
+    const options = prefs.get('editor.beautify');
+    options.indent_size = tabs ? 1 : prefs.get('editor.tabSize');
+    options.indent_char = tabs ? '\t' : ' ';
 
-    var section = getSectionForChild(event.target);
-    var scope = section ? [section.CodeMirror] : editors;
+    const section = getSectionForChild(event.target);
+    const scope = section ? [section.CodeMirror] : editors;
 
-    showHelp(t("styleBeautify"), "<div class='beautify-options'>" +
-      optionHtml(".selector1,", "selector_separator_newline") +
-      optionHtml(".selector2,", "newline_before_open_brace") +
-      optionHtml("{", "newline_after_open_brace") +
-      optionHtml("border: none;", "newline_between_properties", true) +
-      optionHtml("display: block;", "newline_before_close_brace", true) +
-      optionHtml("}", "newline_between_rules") +
+    showHelp(t('styleBeautify'), '<div class="beautify-options">' +
+      optionHtml('.selector1,', 'selector_separator_newline') +
+      optionHtml('.selector2,', 'newline_before_open_brace') +
+      optionHtml('{', 'newline_after_open_brace') +
+      optionHtml('border: none;', 'newline_between_properties', true) +
+      optionHtml('display: block;', 'newline_before_close_brace', true) +
+      optionHtml('}', 'newline_between_rules') +
       `<label style="display: block; clear: both;"><input data-option="indent_conditional" type="checkbox"
         ${options.indent_conditional !== false ? 'checked' : ''}>` +
         t('styleBeautifyIndentConditional') + '</label>' +
-      "</div>" +
-      "<div><button role='undo'></button></div>");
+      '</div>' +
+      '<div><button role="undo"></button></div>');
 
-    var undoButton = document.querySelector("#help-popup button[role='undo']");
-    undoButton.textContent = t(scope.length == 1 ? "undo" : "undoGlobal");
-    undoButton.addEventListener("click", function() {
-      var undoable = false;
+    const undoButton = document.querySelector('#help-popup button[role="undo"]');
+    undoButton.textContent = t(scope.length == 1 ? 'undo' : 'undoGlobal');
+    undoButton.addEventListener('click', function() {
+      let undoable = false;
       scope.forEach(function(cm) {
         if (cm.beautifyChange && cm.beautifyChange[cm.changeGeneration()]) {
           delete cm.beautifyChange[cm.changeGeneration()];
@@ -1161,8 +1181,8 @@ function beautify(event) {
         const pos = options.translate_positions =
           [].concat.apply([], cm.doc.sel.ranges.map(r =>
             [Object.assign({}, r.anchor), Object.assign({}, r.head)]));
-        var text = cm.getValue();
-        var newText = exports.css_beautify(text, options);
+        const text = cm.getValue();
+        const newText = exports.css_beautify(text, options);
         if (newText != text) {
           if (!cm.beautifyChange || !cm.beautifyChange[cm.changeGeneration()]) {
             // clear the list if last change wasn't a css-beautify
@@ -1190,27 +1210,28 @@ function beautify(event) {
     };
 
     function optionHtml(label, optionName, indent) {
-      var value = options[optionName];
-      return "<div newline='" + value.toString() + "'>" +
-        "<span" + (indent ? " indent" : "") + ">" + label + "</span>" +
-        "<select data-option='" + optionName + "'>" +
-          "<option" + (value ? "" : " selected") + ">&nbsp;</option>" +
-          "<option" + (value ? " selected" : "") + ">\\n</option>" +
-        "</select></div>";
+      const value = options[optionName];
+      return '<div newline="' + value.toString() + '">' +
+        '<span' + (indent ? ' indent' : '') + '>' + label + '</span>' +
+        '<select data-option="' + optionName + '">' +
+          '<option' + (value ? '' : ' selected') + '>&nbsp;</option>' +
+          '<option' + (value ? ' selected' : '') + '>\\n</option>' +
+        '</select></div>';
     }
   }
 }
 
-document.addEventListener("DOMContentLoaded", init);
+document.addEventListener('DOMContentLoaded', init);
 
 function init() {
   initCodeMirror();
-  var params = getParams();
+  const params = getParams();
   if (!params.id) { // match should be 2 - one for the whole thing, one for the parentheses
     // This is an add
-    tE("heading", "addStyleTitle");
-    var section = {code: ""}
-    for (var i in CssToProperty) {
+    tE('heading', 'addStyleTitle');
+    const section = {code: ''};
+    let i;
+    for (i in CssToProperty) {
       if (params[i]) {
         section[CssToProperty[i]] = [params[i]];
       }
@@ -1220,13 +1241,13 @@ function init() {
       addSection(null, section);
       editors[0].setOption('lint', CodeMirror.defaults.lint);
       // default to enabled
-      document.getElementById("enabled").checked = true
+      document.getElementById('enabled').checked = true;
       initHooks();
     };
     return;
   }
   // This is an edit
-  tE("heading", "editStyleHeading", null, false);
+  tE('heading', 'editStyleHeading', null, false);
   getStylesSafe({id: params.id}).then(styles => {
     let style = styles[0];
     if (!style) {
@@ -1246,9 +1267,9 @@ function init() {
 }
 
 function setStyleMeta(style) {
-  document.getElementById("name").value = style.name;
-  document.getElementById("enabled").checked = style.enabled;
-  document.getElementById("url").href = style.url;
+  document.getElementById('name').value = style.name;
+  document.getElementById('enabled').checked = style.enabled;
+  document.getElementById('url').href = style.url;
 }
 
 function initWithStyle({style, codeIsUpdated}) {
@@ -1262,8 +1283,8 @@ function initWithStyle({style, codeIsUpdated}) {
 
   // if this was done in response to an update, we need to clear existing sections
   getSections().forEach(function(div) { div.remove(); });
-  var queue = style.sections.length ? style.sections.slice() : [{code: ""}];
-  var queueStart = new Date().getTime();
+  const queue = style.sections.length ? style.sections.slice() : [{code: ''}];
+  const queueStart = new Date().getTime();
   // after 100ms the sections will be added asynchronously
   while (new Date().getTime() - queueStart <= 100 && queue.length) {
     add();
@@ -1277,37 +1298,37 @@ function initWithStyle({style, codeIsUpdated}) {
   initHooks();
 
   function add() {
-    var sectionDiv = addSection(null, queue.shift());
+    const sectionDiv = addSection(null, queue.shift());
     maximizeCodeHeight(sectionDiv, !queue.length);
     const cm = sectionDiv.CodeMirror;
     setTimeout(() => {
       cm.setOption('lint', CodeMirror.defaults.lint);
       updateLintReport(cm, 0);
-    }, prefs.get("editor.lintDelay"));
+    }, prefs.get('editor.lintDelay'));
   }
 }
 
 function initHooks() {
-  document.querySelectorAll("#header .style-contributor").forEach(function(node) {
-    node.addEventListener("change", onChange);
-    node.addEventListener("input", onChange);
+  document.querySelectorAll('#header .style-contributor').forEach(function(node) {
+    node.addEventListener('change', onChange);
+    node.addEventListener('input', onChange);
   });
-  document.getElementById("toggle-style-help").addEventListener("click", showToggleStyleHelp);
-  document.getElementById("to-mozilla").addEventListener("click", showMozillaFormat, false);
-  document.getElementById("to-mozilla-help").addEventListener("click", showToMozillaHelp, false);
-  document.getElementById("from-mozilla").addEventListener("click", fromMozillaFormat);
-  document.getElementById("beautify").addEventListener("click", beautify);
-  document.getElementById("save-button").addEventListener("click", save, false);
-  document.getElementById("sections-help").addEventListener("click", showSectionHelp, false);
-  document.getElementById("keyMap-help").addEventListener("click", showKeyMapHelp, false);
-  document.getElementById("cancel-button").addEventListener("click", goBackToManage);
-  document.getElementById("lint-help").addEventListener("click", showLintHelp);
-  document.getElementById("lint").addEventListener("click", gotoLintIssue);
-  window.addEventListener("resize", resizeLintReport);
+  document.getElementById('toggle-style-help').addEventListener('click', showToggleStyleHelp);
+  document.getElementById('to-mozilla').addEventListener('click', showMozillaFormat, false);
+  document.getElementById('to-mozilla-help').addEventListener('click', showToMozillaHelp, false);
+  document.getElementById('from-mozilla').addEventListener('click', fromMozillaFormat);
+  document.getElementById('beautify').addEventListener('click', beautify);
+  document.getElementById('save-button').addEventListener('click', save, false);
+  document.getElementById('sections-help').addEventListener('click', showSectionHelp, false);
+  document.getElementById('keyMap-help').addEventListener('click', showKeyMapHelp, false);
+  document.getElementById('cancel-button').addEventListener('click', goBackToManage);
+  document.getElementById('lint-help').addEventListener('click', showLintHelp);
+  document.getElementById('lint').addEventListener('click', gotoLintIssue);
+  window.addEventListener('resize', resizeLintReport);
 
   // touch devices don't have onHover events so the element we'll be toggled via clicking (touching)
-  if ("ontouchstart" in document.body) {
-    document.querySelector("#lint h2").addEventListener("click", toggleLintReport);
+  if ('ontouchstart' in document.body) {
+    document.querySelector('#lint h2').addEventListener('click', toggleLintReport);
   }
 
   document.querySelectorAll(
@@ -1333,22 +1354,22 @@ function toggleContextMenuDelete(event) {
 
 
 function maximizeCodeHeight(sectionDiv, isLast) {
-  var cm = sectionDiv.CodeMirror;
-  var stats = maximizeCodeHeight.stats = maximizeCodeHeight.stats || {totalHeight: 0, deltas: []};
+  const cm = sectionDiv.CodeMirror;
+  const stats = maximizeCodeHeight.stats = maximizeCodeHeight.stats || {totalHeight: 0, deltas: []};
   if (!stats.cmActualHeight) {
     stats.cmActualHeight = getComputedHeight(cm.display.wrapper);
   }
   if (!stats.sectionMarginTop) {
     stats.sectionMarginTop = parseFloat(getComputedStyle(sectionDiv).marginTop);
   }
-  var sectionTop = sectionDiv.getBoundingClientRect().top - stats.sectionMarginTop;
+  const sectionTop = sectionDiv.getBoundingClientRect().top - stats.sectionMarginTop;
   if (!stats.firstSectionTop) {
     stats.firstSectionTop = sectionTop;
   }
-  var extrasHeight = getComputedHeight(sectionDiv) - stats.cmActualHeight;
-  var cmMaxHeight = window.innerHeight - extrasHeight - sectionTop - stats.sectionMarginTop;
-  var cmDesiredHeight = cm.display.sizer.clientHeight + 2*cm.defaultTextHeight();
-  var cmGrantableHeight = Math.max(stats.cmActualHeight, Math.min(cmMaxHeight, cmDesiredHeight));
+  const extrasHeight = getComputedHeight(sectionDiv) - stats.cmActualHeight;
+  const cmMaxHeight = window.innerHeight - extrasHeight - sectionTop - stats.sectionMarginTop;
+  const cmDesiredHeight = cm.display.sizer.clientHeight + 2 * cm.defaultTextHeight();
+  const cmGrantableHeight = Math.max(stats.cmActualHeight, Math.min(cmMaxHeight, cmDesiredHeight));
   stats.deltas.push(cmGrantableHeight - stats.cmActualHeight);
   stats.totalHeight += cmGrantableHeight + extrasHeight;
   if (!isLast) {
@@ -1362,45 +1383,45 @@ function maximizeCodeHeight(sectionDiv, isLast) {
     return;
   }
   // scale heights to fill the gap between last section and bottom edge of the window
-  var sections = document.getElementById("sections");
-  var available = window.innerHeight - sections.getBoundingClientRect().bottom -
+  const sections = document.getElementById('sections');
+  const available = window.innerHeight - sections.getBoundingClientRect().bottom -
     parseFloat(getComputedStyle(sections).marginBottom);
   if (available <= 0) {
     return;
   }
-  var totalDelta = stats.deltas.reduce(function(sum, d) { return sum + d; }, 0);
-  var q = available / totalDelta;
-  var baseHeight = stats.cmActualHeight - stats.sectionMarginTop;
+  const totalDelta = stats.deltas.reduce(function(sum, d) { return sum + d; }, 0);
+  const q = available / totalDelta;
+  const baseHeight = stats.cmActualHeight - stats.sectionMarginTop;
   stats.deltas.forEach(function(delta, index) {
     editors[index].setSize(null, baseHeight + Math.floor(q * delta));
   });
 }
 
 function updateTitle() {
-  var DIRTY_TITLE = "* $";
+  const DIRTY_TITLE = '* $';
 
-  var name = document.getElementById("name").savedValue;
-  var clean = isCleanGlobal();
-  var title = styleId === null ? t("addStyleTitle") : t('editStyleTitle', [name]);
-  document.title = clean ? title : DIRTY_TITLE.replace("$", title);
+  const name = document.getElementById('name').savedValue;
+  const clean = isCleanGlobal();
+  const title = styleId === null ? t('addStyleTitle') : t('editStyleTitle', [name]);
+  document.title = clean ? title : DIRTY_TITLE.replace('$', title);
 }
 
 function validate() {
-  var name = document.getElementById("name").value;
-  if (name == "") {
-    return t("styleMissingName");
+  const name = document.getElementById('name').value;
+  if (name == '') {
+    return t('styleMissingName');
   }
   // validate the regexps
-  if (document.querySelectorAll(".applies-to-list").some(function(list) {
+  if (document.querySelectorAll('.applies-to-list').some(function(list) {
     return list.childNodes.some(function(li) {
       if (li.className == template.appliesToEverything.className) {
         return false;
       }
-      var valueElement = li.querySelector("[name=applies-value]");
-      var type = li.querySelector("[name=applies-type]").value;
-      var value = valueElement.value;
+      const valueElement = li.querySelector('[name=applies-value]');
+      const type = li.querySelector('[name=applies-type]').value;
+      const value = valueElement.value;
       if (type && value) {
-        if (type == "regexp") {
+        if (type == 'regexp') {
           try {
             new RegExp(value);
           } catch (ex) {
@@ -1412,7 +1433,7 @@ function validate() {
       return false;
     });
   })) {
-    return t("styleBadRegexp");
+    return t('styleBadRegexp');
   }
   return null;
 }
@@ -1421,17 +1442,17 @@ function save() {
   updateLintReport(null, 0);
 
   // save the contents of the CodeMirror editors back into the textareas
-  for (var i=0; i < editors.length; i++) {
+  for (let i = 0; i < editors.length; i++) {
     editors[i].save();
   }
 
-  var error = validate();
+  const error = validate();
   if (error) {
     alert(error);
     return;
   }
-  var name = document.getElementById("name").value;
-  var enabled = document.getElementById("enabled").checked;
+  const name = document.getElementById('name').value;
+  const enabled = document.getElementById('enabled').checked;
   saveStyleSafe({
     id: styleId,
     name: name,
@@ -1443,10 +1464,10 @@ function save() {
 }
 
 function getSectionsHashes() {
-  var sections = [];
+  const sections = [];
   getSections().forEach(function(div) {
-    var meta = getMeta(div);
-    var code = div.CodeMirror.getValue();
+    const meta = getMeta(div);
+    const code = div.CodeMirror.getValue();
     if (/^\s*$/.test(code) && Object.keys(meta).length == 0) {
       return;
     }
@@ -1457,15 +1478,15 @@ function getSectionsHashes() {
 }
 
 function getMeta(e) {
-  var meta = {urls: [], urlPrefixes: [], domains: [], regexps: []};
-  e.querySelector(".applies-to-list").childNodes.forEach(function(li) {
+  const meta = {urls: [], urlPrefixes: [], domains: [], regexps: []};
+  e.querySelector('.applies-to-list').childNodes.forEach(function(li) {
     if (li.className == template.appliesToEverything.className) {
       return;
     }
-    var type = li.querySelector("[name=applies-type]").value;
-    var value = li.querySelector("[name=applies-value]").value;
+    const type = li.querySelector('[name=applies-type]').value;
+    const value = li.querySelector('[name=applies-value]').value;
     if (type && value) {
-      var property = CssToProperty[type];
+      const property = CssToProperty[type];
       meta[property].push(value);
     }
   });
@@ -1477,96 +1498,100 @@ function saveComplete(style) {
   setCleanGlobal();
 
   // Go from new style URL to edit style URL
-  if (location.href.indexOf("id=") == -1) {
-    history.replaceState({}, document.title, "edit.html?id=" + style.id);
-    tE("heading", "editStyleHeading", null, false);
+  if (location.href.indexOf('id=') == -1) {
+    history.replaceState({}, document.title, 'edit.html?id=' + style.id);
+    tE('heading', 'editStyleHeading', null, false);
   }
   updateTitle();
 }
 
 function showMozillaFormat() {
-  var popup = showCodeMirrorPopup(t("styleToMozillaFormatTitle"), "", {readOnly: true});
+  const popup = showCodeMirrorPopup(t('styleToMozillaFormatTitle'), '', {readOnly: true});
   popup.codebox.setValue(toMozillaFormat());
-  popup.codebox.execCommand("selectAll");
+  popup.codebox.execCommand('selectAll');
 }
 
 function toMozillaFormat() {
   return getSectionsHashes().map(function(section) {
-    var cssMds = [];
-    for (var i in propertyToCss) {
+    let cssMds = [];
+    let i;
+    for (i in propertyToCss) {
       if (section[i]) {
-        cssMds = cssMds.concat(section[i].map(function (v){
-          return propertyToCss[i] + "(\"" + v.replace(/\\/g, "\\\\") + "\")";
+        cssMds = cssMds.concat(section[i].map(function(v) {
+          return propertyToCss[i] + '("' + v.replace(/\\/g, '\\\\') + '")';
         }));
       }
     }
-    return cssMds.length ? "@-moz-document " + cssMds.join(", ") + " {\n" + section.code + "\n}" : section.code;
-  }).join("\n\n");
+    return cssMds.length ? '@-moz-document ' + cssMds.join(', ') + ' {\n' + section.code + '\n}' : section.code;
+  }).join('\n\n');
 }
 
 function fromMozillaFormat() {
-  var popup = showCodeMirrorPopup(t("styleFromMozillaFormatPrompt"), tHTML("<div>\
-    <button name='import-append' i18n-text='importAppendLabel' i18n-title='importAppendTooltip'></button>\
-    <button name='import-replace' i18n-text='importReplaceLabel' i18n-title='importReplaceTooltip'></button>\
-    </div>").innerHTML);
+  const popup = showCodeMirrorPopup(t('styleFromMozillaFormatPrompt'), tHTML(`<div>
+      <button name="import-append" i18n-text="importAppendLabel" i18n-title="importAppendTooltip"></button>
+      <button name="import-replace" i18n-text="importReplaceLabel" i18n-title="importReplaceTooltip"></button>
+    </div>`
+  ).innerHTML);
 
-  var contents = popup.querySelector(".contents");
+  const contents = popup.querySelector('.contents');
   contents.insertBefore(popup.codebox.display.wrapper, contents.firstElementChild);
   popup.codebox.focus();
 
-  popup.querySelector("[name='import-append']").addEventListener("click", doImport);
-  popup.querySelector("[name='import-replace']").addEventListener("click", doImport);
+  popup.querySelector('[name="import-append"]').addEventListener('click', doImport);
+  popup.querySelector('[name="import-replace"]').addEventListener('click', doImport);
 
-  popup.codebox.on("change", function() {
+  popup.codebox.on('change', function() {
     clearTimeout(popup.mozillaTimeout);
     popup.mozillaTimeout = setTimeout(function() {
-      popup.classList.toggle("ready", trimNewLines(popup.codebox.getValue()));
+      popup.classList.toggle('ready', trimNewLines(popup.codebox.getValue()));
     }, 100);
   });
 
   function doImport() {
-    var replaceOldStyle = this.name == "import-replace";
-    popup.querySelector(".dismiss").onclick();
-    var mozStyle = trimNewLines(popup.codebox.getValue());
-    var parser = new parserlib.css.Parser(), lines = mozStyle.split("\n");
-    var sectionStack = [{code: "", start: {line: 1, col: 1}}];
-    var errors = "", oldSectionCount = editors.length;
-    var firstAddedCM;
+    const replaceOldStyle = this.name == 'import-replace';
+    popup.querySelector('.dismiss').onclick();
+    const mozStyle = trimNewLines(popup.codebox.getValue());
+    const parser = new parserlib.css.Parser();
+    const lines = mozStyle.split('\n');
+    const sectionStack = [{code: '', start: {line: 1, col: 1}}];
+    let errors = '';
+    // let oldSectionCount = editors.length;
+    let firstAddedCM;
 
-    parser.addListener("startdocument", function(e) {
-      var outerText = getRange(sectionStack.last.start, (--e.col, e));
-      var gapComment = outerText.match(/(\/\*[\s\S]*?\*\/)[\s\n]*$/);
-      var section = {code: "", start: backtrackTo(this, parserlib.css.Tokens.LBRACE, "end")};
+    parser.addListener('startdocument', function(e) {
+      let outerText = getRange(sectionStack.last.start, (--e.col, e));
+      const gapComment = outerText.match(/(\/\*[\s\S]*?\*\/)[\s\n]*$/);
+      const section = {code: '', start: backtrackTo(this, parserlib.css.Tokens.LBRACE, 'end')};
       // move last comment before @-moz-document inside the section
       if (gapComment && !gapComment[1].match(/\/\*\s*AGENT_SHEET\s*\*\//)) {
-        section.code = gapComment[1] + "\n";
+        section.code = gapComment[1] + '\n';
         outerText = trimNewLines(outerText.substring(0, gapComment.index));
       }
       if (outerText.trim()) {
         sectionStack.last.code = outerText;
         doAddSection(sectionStack.last);
-        sectionStack.last.code = "";
+        sectionStack.last.code = '';
       }
       e.functions.forEach(function(f) {
-        var m = f.match(/^(url|url-prefix|domain|regexp)\((['"]?)(.+?)\2?\)$/);
-        var aType = CssToProperty[m[1]];
-        var aValue = aType != "regexps" ? m[3] : m[3].replace(/\\\\/g, "\\");
+        const m = f.match(/^(url|url-prefix|domain|regexp)\((['"]?)(.+?)\2?\)$/);
+        const aType = CssToProperty[m[1]];
+        const aValue = aType != 'regexps' ? m[3] : m[3].replace(/\\\\/g, '\\');
         (section[aType] = section[aType] || []).push(aValue);
       });
       sectionStack.push(section);
     });
 
-    parser.addListener("enddocument", function(e) {
-      var end = backtrackTo(this, parserlib.css.Tokens.RBRACE, "start");
-      var section = sectionStack.pop();
+    parser.addListener('enddocument', function() {
+      const end = backtrackTo(this, parserlib.css.Tokens.RBRACE, 'start');
+      const section = sectionStack.pop();
       section.code += getRange(section.start, end);
       sectionStack.last.start = (++end.col, end);
       doAddSection(section);
     });
 
-    parser.addListener("endstylesheet", function() {
+    parser.addListener('endstylesheet', function() {
       // add nonclosed outer sections (either broken or the last global one)
-      var endOfText = {line: lines.length, col: lines.last.length + 1};
+      const endOfText = {line: lines.length, col: lines.last.length + 1};
       sectionStack.last.code += getRange(sectionStack.last.start, endOfText);
       sectionStack.forEach(doAddSection);
 
@@ -1579,19 +1604,21 @@ function fromMozillaFormat() {
       firstAddedCM.focus();
 
       if (errors) {
-        showHelp(t("issues"), errors);
+        showHelp(t('issues'), errors);
       }
     });
 
-    parser.addListener("error", function(e) {
-      errors += e.line + ":" + e.col + " " + e.message.replace(/ at line \d.+$/, "") + "<br>";
+    parser.addListener('error', function(e) {
+      errors += e.line + ':' + e.col + ' ' + e.message.replace(/ at line \d.+$/, '') + '<br>';
     });
 
     parser.parse(mozStyle);
 
-    function getRange( start, end) {
-      const L1 = start.line - 1, C1 = start.col - 1;
-      const L2 = end.line - 1, C2 = end.col - 1;
+    function getRange(start, end) {
+      const L1 = start.line - 1;
+      const C1 = start.col - 1;
+      const L2 = end.line - 1;
+      const C2 = end.col - 1;
       if (L1 == L2) {
         return lines[L1].substr(C1, C2 - C1 + 1);
       } else {
@@ -1603,11 +1630,13 @@ function fromMozillaFormat() {
     function doAddSection(section) {
       section.code = section.code.trim();
       // don't add empty sections
-      if (!section.code
-      && !section.urls
-      && !section.urlPrefixes
-      && !section.domains
-      && !section.regexps) {
+      if (
+        !section.code &&
+        !section.urls &&
+        !section.urlPrefixes &&
+        !section.domains &&
+        !section.regexps
+      ) {
         return;
       }
       if (!firstAddedCM) {
@@ -1621,8 +1650,8 @@ function fromMozillaFormat() {
     // do onetime housekeeping as the imported text is confirmed to be a valid style
     function initFirstSection(section) {
       // skip adding the first global section when there's no code/comments
-      if (!section.code.replace("@namespace url(http://www.w3.org/1999/xhtml);", "") /* ignore boilerplate NS */
-          .replace(/[\s\n]/g, "")) { /* ignore all whitespace including new lines */
+      if (!section.code.replace('@namespace url(http://www.w3.org/1999/xhtml);', '') /* ignore boilerplate NS */
+          .replace(/[\s\n]/g, '')) { /* ignore all whitespace including new lines */
         return false;
       }
       if (replaceOldStyle) {
@@ -1631,7 +1660,7 @@ function fromMozillaFormat() {
         });
       } else if (!editors.last.getValue()) {
         // nuke the last blank section
-        if (editors.last.getSection().querySelector(".applies-to-everything")) {
+        if (editors.last.getSection().querySelector('.applies-to-everything')) {
           removeSection({target: editors.last.getSection()});
         }
       }
@@ -1639,81 +1668,81 @@ function fromMozillaFormat() {
     }
   }
   function backtrackTo(parser, tokenType, startEnd) {
-    var tokens = parser._tokenStream._lt;
-    for (var i = parser._tokenStream._ltIndex - 1; i >= 0; --i) {
+    const tokens = parser._tokenStream._lt;
+    for (let i = parser._tokenStream._ltIndex - 1; i >= 0; --i) {
       if (tokens[i].type == tokenType) {
-        return {line: tokens[i][startEnd+"Line"], col: tokens[i][startEnd+"Col"]};
+        return {line: tokens[i][startEnd + 'Line'], col: tokens[i][startEnd + 'Col']};
       }
     }
   }
   function trimNewLines(s) {
-    return s.replace(/^[\s\n]+/, "").replace(/[\s\n]+$/, "");
+    return s.replace(/^[\s\n]+/, '').replace(/[\s\n]+$/, '');
   }
 }
 
 function showSectionHelp() {
-  showHelp(t("styleSectionsTitle"), t("sectionHelp"));
+  showHelp(t('styleSectionsTitle'), t('sectionHelp'));
 }
 
 function showAppliesToHelp() {
-  showHelp(t("appliesLabel"), t("appliesHelp"));
+  showHelp(t('appliesLabel'), t('appliesHelp'));
 }
 
 function showToMozillaHelp() {
-  showHelp(t("styleMozillaFormatHeading"), t("styleToMozillaFormatHelp"));
+  showHelp(t('styleMozillaFormatHeading'), t('styleToMozillaFormatHelp'));
 }
 
 function showToggleStyleHelp() {
-  showHelp(t("helpAlt"), t("styleEnabledToggleHint"));
+  showHelp(t('helpAlt'), t('styleEnabledToggleHint'));
 }
 
 function showKeyMapHelp() {
-  var keyMap = mergeKeyMaps({}, prefs.get("editor.keyMap"), CodeMirror.defaults.extraKeys);
-  var keyMapSorted = Object.keys(keyMap)
-    .map(function(key) { return {key: key, cmd: keyMap[key]} })
-    .concat([{key: "Shift-Ctrl-Wheel", cmd: "scrollWindow"}])
-    .sort(function(a, b) { return a.cmd < b.cmd || (a.cmd == b.cmd && a.key < b.key) ? -1 : 1 });
-  showHelp(t("cm_keyMap") + ": " + prefs.get("editor.keyMap"),
+  const keyMap = mergeKeyMaps({}, prefs.get('editor.keyMap'), CodeMirror.defaults.extraKeys);
+  const keyMapSorted = Object.keys(keyMap)
+    .map(function(key) { return {key: key, cmd: keyMap[key]}; })
+    .concat([{key: 'Shift-Ctrl-Wheel', cmd: 'scrollWindow'}])
+    .sort(function(a, b) { return a.cmd < b.cmd || (a.cmd == b.cmd && a.key < b.key) ? -1 : 1; });
+  showHelp(t('cm_keyMap') + ': ' + prefs.get('editor.keyMap'),
     '<table class="keymap-list">' +
-      '<thead><tr><th><input placeholder="' + t("helpKeyMapHotkey") + '" type="search"></th>' +
-        '<th><input placeholder="' + t("helpKeyMapCommand") + '" type="search"></th></tr></thead>' +
-      "<tbody>" + keyMapSorted.map(function(value) {
-        return "<tr><td>" + value.key + "</td><td>" + value.cmd + "</td></tr>";
-      }).join("") +
-      "</tbody>" +
-    "</table>");
+      '<thead><tr><th><input placeholder="' + t('helpKeyMapHotkey') + '" type="search"></th>' +
+        '<th><input placeholder="' + t('helpKeyMapCommand') + '" type="search"></th></tr></thead>' +
+      '<tbody>' + keyMapSorted.map(function(value) {
+        return '<tr><td>' + value.key + '</td><td>' + value.cmd + '</td></tr>';
+      }).join('') +
+      '</tbody>' +
+    '</table>');
 
-  var table = document.querySelector("#help-popup table");
-  table.addEventListener("input", filterTable);
+  const table = document.querySelector('#help-popup table');
+  table.addEventListener('input', filterTable);
 
-  var inputs = table.querySelectorAll("input");
-  inputs[0].addEventListener("keydown", hotkeyHandler);
+  const inputs = table.querySelectorAll('input');
+  inputs[0].addEventListener('keydown', hotkeyHandler);
   inputs[1].focus();
 
   function hotkeyHandler(event) {
-    var keyName = CodeMirror.keyName(event);
-    if (keyName == "Esc" || keyName == "Tab" || keyName == "Shift-Tab") {
+    const keyName = CodeMirror.keyName(event);
+    if (keyName == 'Esc' || keyName == 'Tab' || keyName == 'Shift-Tab') {
       return;
     }
     event.preventDefault();
     event.stopPropagation();
     // normalize order of modifiers,
-    // for modifier-only keys ("Ctrl-Shift") a dummy main key has to be temporarily added
-    var keyMap = {};
-    keyMap[keyName.replace(/(Shift|Ctrl|Alt|Cmd)$/, "$&-dummy")] = "";
-    var normalizedKey = Object.keys(CodeMirror.normalizeKeyMap(keyMap))[0];
-    this.value = normalizedKey.replace("-dummy", "");
+    // for modifier-only keys ('Ctrl-Shift') a dummy main key has to be temporarily added
+    const keyMap = {};
+    keyMap[keyName.replace(/(Shift|Ctrl|Alt|Cmd)$/, '$&-dummy')] = '';
+    const normalizedKey = Object.keys(CodeMirror.normalizeKeyMap(keyMap))[0];
+    this.value = normalizedKey.replace('-dummy', '');
     filterTable(event);
   }
   function filterTable(event) {
-    var input = event.target;
-    var query = stringAsRegExp(input.value, "gi");
-    var col = input.parentNode.cellIndex;
-    inputs[1 - col].value = "";
+    const input = event.target;
+    const query = stringAsRegExp(input.value, 'gi');
+    const col = input.parentNode.cellIndex;
+    inputs[1 - col].value = '';
     table.tBodies[0].childNodes.forEach(function(row) {
-      var cell = row.children[col];
-      cell.innerHTML = cell.textContent.replace(query, "<mark>$&</mark>");
-      row.style.display = query.test(cell.textContent) ? "" : "none";
+      let cell = row.children[col];
+      cell.innerHTML = cell.textContent.replace(query, '<mark>$&</mark>');
+      row.style.display = query.test(cell.textContent) ? '' : 'none';
       // clear highlight from the other column
       cell = row.children[1 - col];
       cell.innerHTML = cell.textContent;
@@ -1721,18 +1750,18 @@ function showKeyMapHelp() {
   }
   function mergeKeyMaps(merged, ...more) {
     more.forEach(keyMap => {
-      if (typeof keyMap == "string") {
+      if (typeof keyMap == 'string') {
         keyMap = CodeMirror.keyMap[keyMap];
       }
       Object.keys(keyMap).forEach(function(key) {
-        var cmd = keyMap[key];
+        let cmd = keyMap[key];
         // filter out '...', 'attach', etc. (hotkeys start with an uppercase letter)
-        if (!merged[key] && !key.match(/^[a-z]/) && cmd != "...") {
-          if (typeof cmd == "function") {
+        if (!merged[key] && !key.match(/^[a-z]/) && cmd != '...') {
+          if (typeof cmd == 'function') {
             // for 'emacs' keymap: provide at least something meaningful (hotkeys and the function body)
             // for 'vim*' keymaps: almost nothing as it doesn't rely on CM keymap mechanism
-            cmd = cmd.toString().replace(/^function.*?\{[\s\r\n]*([\s\S]+?)[\s\r\n]*\}$/, "$1");
-            merged[key] = cmd.length <= 200 ? cmd : cmd.substr(0, 200) + "...";
+            cmd = cmd.toString().replace(/^function.*?\{[\s\r\n]*([\s\S]+?)[\s\r\n]*\}$/, '$1');
+            merged[key] = cmd.length <= 200 ? cmd : cmd.substr(0, 200) + '...';
           } else {
             merged[key] = cmd;
           }
@@ -1747,10 +1776,10 @@ function showKeyMapHelp() {
 }
 
 function showLintHelp() {
-  showHelp(t("issues"), t("issuesHelp") + "<ul>" +
+  showHelp(t('issues'), t('issuesHelp') + '<ul>' +
     CSSLint.getRules().map(function(rule) {
-      return "<li><b>" + rule.name + "</b><br>" + rule.desc + "</li>";
-    }).join("") + "</ul>"
+      return '<li><b>' + rule.name + '</b><br>' + rule.desc + '</li>';
+    }).join('') + '</ul>'
   );
 }
 
@@ -1860,60 +1889,62 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
 }
 
 function showHelp(title, text) {
-  var div = document.getElementById("help-popup");
-  div.classList.remove("big");
-  div.querySelector(".contents").innerHTML = text;
-  div.querySelector(".title").innerHTML = title;
+  const div = document.getElementById('help-popup');
+  div.classList.remove('big');
+  div.querySelector('.contents').innerHTML = text;
+  div.querySelector('.title').innerHTML = title;
 
-  if (getComputedStyle(div).display == "none") {
-    document.addEventListener("keydown", closeHelp);
-    div.querySelector(".dismiss").onclick = closeHelp; // avoid chaining on multiple showHelp() calls
+  if (getComputedStyle(div).display == 'none') {
+    document.addEventListener('keydown', closeHelp);
+    div.querySelector('.dismiss').onclick = closeHelp; // avoid chaining on multiple showHelp() calls
   }
 
-  div.style.display = "block";
+  div.style.display = 'block';
   return div;
 
   function closeHelp(e) {
-    if (!e
-    || e.type == "click"
-    || ((e.keyCode || e.which) == 27 && !e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)) {
-      div.style.display = "";
-      document.querySelector(".contents").innerHTML = "";
-      document.removeEventListener("keydown", closeHelp);
+    if (
+      !e ||
+      e.type == 'click' ||
+      ((e.keyCode || e.which) == 27 && !e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)
+    ) {
+      div.style.display = '';
+      document.querySelector('.contents').innerHTML = '';
+      document.removeEventListener('keydown', closeHelp);
     }
   }
 }
 
 function showCodeMirrorPopup(title, html, options) {
-  var popup = showHelp(title, html);
-  popup.classList.add("big");
+  const popup = showHelp(title, html);
+  popup.classList.add('big');
 
-  popup.codebox = CodeMirror(popup.querySelector(".contents"), Object.assign({
-    mode: "css",
+  popup.codebox = CodeMirror(popup.querySelector('.contents'), Object.assign({
+    mode: 'css',
     lineNumbers: true,
     lineWrapping: true,
     foldGutter: true,
-    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter", "CodeMirror-lint-markers"],
+    gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter', 'CodeMirror-lint-markers'],
     matchBrackets: true,
     lint: {getAnnotations: CodeMirror.lint.css, delay: 0},
     styleActiveLine: true,
-    theme: prefs.get("editor.theme"),
-    keyMap: prefs.get("editor.keyMap")
+    theme: prefs.get('editor.theme'),
+    keyMap: prefs.get('editor.keyMap')
   }, options));
   popup.codebox.focus();
-  popup.codebox.on("focus", function() { hotkeyRerouter.setState(false) });
-  popup.codebox.on("blur", function() { hotkeyRerouter.setState(true) });
+  popup.codebox.on('focus', function() { hotkeyRerouter.setState(false); });
+  popup.codebox.on('blur', function() { hotkeyRerouter.setState(true); });
   return popup;
 }
 
 function getParams() {
-  var params = {};
-  var urlParts = location.href.split("?", 2);
+  const params = {};
+  const urlParts = location.href.split('?', 2);
   if (urlParts.length == 1) {
     return params;
   }
-  urlParts[1].split("&").forEach(function(keyValue) {
-    var splitKeyValue = keyValue.split("=", 2);
+  urlParts[1].split('&').forEach(function(keyValue) {
+    const splitKeyValue = keyValue.split('=', 2);
     params[decodeURIComponent(splitKeyValue[0])] = decodeURIComponent(splitKeyValue[1]);
   });
   return params;
@@ -1923,7 +1954,7 @@ chrome.runtime.onMessage.addListener(onRuntimeMessage);
 
 function onRuntimeMessage(request) {
   switch (request.method) {
-    case "styleUpdated":
+    case 'styleUpdated':
       if (styleId && styleId == request.style.id && request.reason != 'editSave') {
         if ((request.style.sections[0] || {}).code === null) {
           // the code-less style came from notifyAllTabs
@@ -1936,14 +1967,14 @@ function onRuntimeMessage(request) {
         }
       }
       break;
-    case "styleDeleted":
+    case 'styleDeleted':
       if (styleId && styleId == request.id) {
         window.onbeforeunload = function() {};
         window.close();
         break;
       }
       break;
-    case "prefChanged":
+    case 'prefChanged':
       if ('editor.smartIndent' in request.prefs) {
         CodeMirror.setOption('smartIndent', request.prefs['editor.smartIndent']);
       }
@@ -1955,7 +1986,7 @@ function onRuntimeMessage(request) {
 }
 
 function getComputedHeight(el) {
-  var compStyle = getComputedStyle(el);
+  const compStyle = getComputedStyle(el);
   return el.getBoundingClientRect().height +
     parseFloat(compStyle.marginTop) + parseFloat(compStyle.marginBottom);
 }
diff --git a/js/dom.js b/js/dom.js
index 2dca2090..88fd44b6 100644
--- a/js/dom.js
+++ b/js/dom.js
@@ -12,6 +12,7 @@ for (const type of [NodeList, NamedNodeMap, HTMLCollection, HTMLAllCollection])
 }
 
 // add favicon in Firefox
+// eslint-disable-next-line no-unused-expressions
 navigator.userAgent.includes('Firefox') && setTimeout(() => {
   const iconset = ['', 'light/'][prefs.get('iconset')] || '';
   for (const size of [38, 32, 19, 16]) {
diff --git a/manage/manage.js b/manage/manage.js
index da268c6b..434e7b49 100644
--- a/manage/manage.js
+++ b/manage/manage.js
@@ -128,8 +128,11 @@ function showStyles(styles = []) {
   function renderStyles() {
     const t0 = performance.now();
     let rendered = 0;
-    while (index < sorted.length
-    && (shouldRenderAll || ++rendered < 10 || performance.now() - t0 < 10)) {
+    while (
+      index < sorted.length &&
+      // eslint-disable-next-line no-unmodified-loop-condition
+      (shouldRenderAll || ++rendered < 10 || performance.now() - t0 < 10)
+    ) {
       renderBin.appendChild(createStyleElement(sorted[index++]));
     }
     filterAndAppend({container: renderBin});
@@ -976,9 +979,14 @@ function objectDiff(first, second, path = '') {
       continue;
     }
     if (a && typeof a.filter == 'function' && b && typeof b.filter == 'function') {
-      if (a.length != b.length
-      || a.some((el, i) => !el || typeof el != 'object' ? el != b[i]
-          : objectDiff(el, b[i], path + key + '[' + i + '].').length)
+      if (
+        a.length != b.length ||
+        a.some((el, i) => {
+          const result = !el || typeof el != 'object'
+            ? el != b[i]
+            : objectDiff(el, b[i], path + key + '[' + i + '].').length;
+          return result;
+        })
       ) {
         diff.push({path, key, values: [a, b], type: 'changed'});
       }

From c97151edf39f79acbdd6567d84252949b9807d82 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Wed, 12 Jul 2017 15:59:36 -0500
Subject: [PATCH 77/94] Add contributing & issue template files

---
 .github/CONTRIBUTING.md   | 33 +++++++++++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE.md | 28 ++++++++++++++++++++++++++++
 README.md                 |  8 +++++---
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 .github/CONTRIBUTING.md
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 00000000..0fb81935
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,33 @@
+# Contributing to Stylus
+
+1. [Getting Involved](#getting-involved)
+2. [How to Report Issues](#how-to-report-issues)
+3. [Adding Tranlations](#adding-translations)
+4. [Core Style Guide](#core-style-guide)
+5. [Getting Started](#getting-started)
+
+## Getting Involved
+
+There are a number of ways to get involved with the development of Stylus. Even if you've never contributed to an Open Source project before, we're always looking for help by identifying issues and suggesting improvements.
+
+## How to Report issues
+
+When an issue is opened, a template is provided. Please answer these questions as thoroughly as possible. If we were psychic, we'd be hanging out in casinos playing poker until they kicked us out. We can't read your mind! Please provide step-by-step direction on how to reproduce the issue as well as the browser, operating system and versions of each.
+
+When adding a feature request, please include
+
+## Adding Translations
+
+You can help us translate the extension on [Transifex](https://www.transifex.com/github-7/Stylus). When `messages.json` file is ready to be merged, please open a new bug report in [stylus/issues](https://github.com/openstyles/stylus/issues).
+
+## Core Style Guide
+
+* Use the provided `.editorconfig` file with your code editor. Don't know what that is? Then check out http://editorconfig.org/.
+
+## Getting Started
+
+* First open an issue to discuss your changes.
+* Then download, fork or clone this repository.
+<!-- * Use [node.js](http://nodejs.org/) to run `npm install`. -->
+* Make any changes within a branch of this repository (not the `master` branch).
+* Submit a pull request and include a reference to the initial issue with the discussion.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..a44bd728
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+<!--
+Thank you for reporting an issue. Please make sure that your style is up to
+date and you checked the recent commits that your issue wasn't recently
+addressed. To update:
+
+Make sure to first update DIRECTLY from https://userstyles.org/styles/37035/
+(see https://github.com/JasonBarnabe/stylish-chrome/issues/179 to know why) or,
+if using the GitHub-Dark script, use the "Force Update Style" button, then
+force refresh the web page (Windows: Ctrl+F5; Mac/Apple: Apple+R or Command+R;
+Linux: F5).
+
+If the issue persists, please help us identifying the cause by providing these
+details:
+-->
+
+* **Browser**:
+* **Operating System**:
+* **Screenshot**:
+
+* **HTML of the section where the issue occurs**:
+
+<!-- You can get the HTML by right click on the element, look for the
+     highlighted node in the DevTools, right click it and select
+     Copy -> Outer HTML -->
+
+````html
+
+````
diff --git a/README.md b/README.md
index f5e0f4ff..cc1c379b 100644
--- a/README.md
+++ b/README.md
@@ -16,13 +16,15 @@ See the [help docs](http://userstyles.org/help/stylish_chrome) or [ask in userst
 
 ## Contributing
 
-The source is hosted on [GitHub](https://github.com/schomery/stylus) and pull requests are welcome.
+The source is hosted on [GitHub](https://github.com/openstyles/stylus) and pull requests are welcome.
 
-You can help us translate the extension on [Transifex](https://www.transifex.com/github-7/Stylus). When `messages.json` file is ready to be merged, please open a new bug report in [stylus/issues](https://github.com/schomery/stylus/issues).
+You can help us translate the extension on [Transifex](https://www.transifex.com/github-7/Stylus). When `messages.json` file is ready to be merged, please open a new bug report in [stylus/issues](https://github.com/openstyles/stylus/issues).
+
+See our [contributing](./.github/CONTRIBUTING.md) page for more details.
 
 ## License
 
-For copyright status of the "codemirror" directory, see codemirror/LICENSE. Everything else is:
+For copyright status of the "codemirror" directory, see [codemirror/LICENSE](https://github.com/openstyles/stylus/blob/master/src/vendor/codemirror/LICENSE). Everything else is:
 
 Copyright (C) 2005-2014 Jason Barnabe <jason.barnabe@gmail.com>
 

From f49747e1bd12c087de883709a1208b80419019af Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Thu, 13 Jul 2017 19:50:24 -0500
Subject: [PATCH 78/94] Adjust pull_locales paths

---
 tools/pull_locales.rb             | 2 +-
 tools/pull_locales_postprocess.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/pull_locales.rb b/tools/pull_locales.rb
index 967cee9b..23ff1225 100644
--- a/tools/pull_locales.rb
+++ b/tools/pull_locales.rb
@@ -22,7 +22,7 @@ project = transifex.project(project_slug)
 project.languages.each do |language|
 	code = language.language_code
 	puts "Getting locale #{code}"
-	dir_name = "_locales/#{code}"
+	dir_name = "../_locales/#{code}"
 	Dir.mkdir(dir_name) if !Dir.exist?(dir_name)
 	has_content = false
 	project.resources.each do |resource|
diff --git a/tools/pull_locales_postprocess.py b/tools/pull_locales_postprocess.py
index d9d0b43a..a4cdb6c2 100644
--- a/tools/pull_locales_postprocess.py
+++ b/tools/pull_locales_postprocess.py
@@ -2,19 +2,19 @@
 import io, os, json, re
 from collections import OrderedDict
 
-with io.open('/_locales/en/messages.json', 'r', encoding='utf-8') as f:
+with io.open('../_locales/en/messages.json', 'r', encoding='utf-8') as f:
     items = json.load(f).items()
     english = [(k, v['message']) for k, v in items if 'message' in v]
     english_placeholders = [(k, v['placeholders']) for k,v in items
                             if 'placeholders' in v]
 
-for locale_name in os.listdir('_locales'):
+for locale_name in os.listdir('../_locales'):
     if locale_name == 'en':
         continue
     if not re.match(r'^\w{2}(_\w{2,3})?$', locale_name):
         print('Skipped %s: not a locale dir' % locale_name)
         continue
-    loc_path = '/_locales/' + locale_name + '/messages.json'
+    loc_path = '../_locales/' + locale_name + '/messages.json'
     with io.open(loc_path, 'r+', encoding='utf-8') as f:
         loc = json.load(f, object_pairs_hook=OrderedDict)
 

From ac91e25eb42cae49198a735adadd7c2b4de31df3 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Thu, 13 Jul 2017 19:52:40 -0500
Subject: [PATCH 79/94] Move messaging.js file & references

---
 edit.html                       | 2 +-
 index.html                      | 2 +-
 {background => js}/messaging.js | 0
 manage.html                     | 2 +-
 manifest.json                   | 2 +-
 popup.html                      | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename {background => js}/messaging.js (100%)

diff --git a/edit.html b/edit.html
index fbb1ed9c..5df54d54 100644
--- a/edit.html
+++ b/edit.html
@@ -3,7 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 
     <script src="js/dom.js"></script>
-    <script src="background/messaging.js"></script>
+    <script src="js/messaging.js"></script>
     <script src="js/prefs.js"></script>
     <script src="js/localization.js"></script>
     <script src="content/apply.js"></script>
diff --git a/index.html b/index.html
index ea19ac4f..c673ac44 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
   <title i18n-text-append="optionsHeading">Stylus </title>
   <link rel="stylesheet" href="options/index.css">
   <script src="js/dom.js"></script>
-  <script src="background/messaging.js"></script>
+  <script src="js/messaging.js"></script>
   <script src="js/localization.js"></script>
   <script src="js/prefs.js"></script>
   <script src="content/apply.js"></script>
diff --git a/background/messaging.js b/js/messaging.js
similarity index 100%
rename from background/messaging.js
rename to js/messaging.js
diff --git a/manage.html b/manage.html
index 855db9eb..b3bb0545 100644
--- a/manage.html
+++ b/manage.html
@@ -122,7 +122,7 @@
   </template>
 
   <script src="js/dom.js"></script>
-  <script src="background/messaging.js"></script>
+  <script src="js/messaging.js"></script>
   <script src="js/prefs.js"></script>
   <script src="content/apply.js"></script>
   <script src="js/localization.js"></script>
diff --git a/manifest.json b/manifest.json
index 97b600e4..2070b4ba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,7 @@
   ],
   "background": {
     "scripts": [
-      "background/messaging.js",
+      "js/messaging.js",
       "background/storage.js",
       "js/prefs.js",
       "background/background.js",
diff --git a/popup.html b/popup.html
index fe5c967f..933df669 100644
--- a/popup.html
+++ b/popup.html
@@ -56,7 +56,7 @@
   </template>
 
   <script src="js/dom.js"></script>
-  <script src="background/messaging.js"></script>
+  <script src="js/messaging.js"></script>
   <script src="js/localization.js"></script>
   <script src="js/prefs.js"></script>
   <script src="content/apply.js"></script>

From 370a0a2c35e85aae73b877f40585472ac6a9ac56 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Fri, 14 Jul 2017 03:21:07 -0500
Subject: [PATCH 80/94] Remove duplicated code in fileSaveLoad.js

---
 manage/fileSaveLoad.js | 396 -----------------------------------------
 1 file changed, 396 deletions(-)

diff --git a/manage/fileSaveLoad.js b/manage/fileSaveLoad.js
index 125ed9e0..9d37fc1b 100644
--- a/manage/fileSaveLoad.js
+++ b/manage/fileSaveLoad.js
@@ -352,402 +352,6 @@ $('#file-all-styles').onclick = () => {
 };
 
 
-$('#unfile-all-styles').onclick = () => {
-  importFromFile({fileTypeFilter: STYLUS_BACKUP_FILE_EXT});
-};
-
-Object.assign(document.body, {
-  ondragover(event) {
-    const hasFiles = event.dataTransfer.types.includes('Files');
-    event.dataTransfer.dropEffect = hasFiles || event.target.type == 'search' ? 'copy' : 'none';
-    this.classList.toggle('dropzone', hasFiles);
-    if (hasFiles) {
-      event.preventDefault();
-      clearTimeout(this.fadeoutTimer);
-      this.classList.remove('fadeout');
-    }
-  },
-  ondragend(event) {
-    animateElement(this, {className: 'fadeout', removeExtraClasses: ['dropzone']}).then(() => {
-      this.style.animationDuration = '';
-    });
-  },
-  ondragleave(event) {
-    try {
-      // in Firefox event.target could be XUL browser and hence there is no permission to access it
-      if (event.target === this) {
-        this.ondragend();
-      }
-    } catch (e) {
-      this.ondragend();
-    }
-  },
-  ondrop(event) {
-    this.ondragend();
-    if (event.dataTransfer.files.length) {
-      event.preventDefault();
-      if ($('#onlyUpdates input').checked) {
-        $('#onlyUpdates input').click();
-      }
-      importFromFile({file: event.dataTransfer.files[0]});
-    }
-  },
-});
-=======
-/* global messageBox, handleUpdate, applyOnMessage */
-'use strict';
-
-const STYLISH_DUMP_FILE_EXT = '.txt';
-const STYLUS_BACKUP_FILE_EXT = '.json';
-
-
-function importFromFile({fileTypeFilter, file} = {}) {
-  return new Promise(resolve => {
-    const fileInput = document.createElement('input');
-    if (file) {
-      readFile();
-      return;
-    }
-    fileInput.style.display = 'none';
-    fileInput.type = 'file';
-    fileInput.accept = fileTypeFilter || STYLISH_DUMP_FILE_EXT;
-    fileInput.acceptCharset = 'utf-8';
-
-    document.body.appendChild(fileInput);
-    fileInput.initialValue = fileInput.value;
-    fileInput.onchange = readFile;
-    fileInput.click();
-
-    function readFile() {
-      if (file || fileInput.value !== fileInput.initialValue) {
-        file = file || fileInput.files[0];
-        if (file.size > 100e6) {
-          console.warn("100MB backup? I don't believe you.");
-          importFromString('').then(resolve);
-          return;
-        }
-        document.body.style.cursor = 'wait';
-        const fReader = new FileReader();
-        fReader.onloadend = event => {
-          fileInput.remove();
-          importFromString(event.target.result).then(numStyles => {
-            document.body.style.cursor = '';
-            resolve(numStyles);
-          });
-        };
-        fReader.readAsText(file, 'utf-8');
-      }
-    }
-  });
-}
-
-
-function importFromString(jsonString) {
-  if (!BG) {
-    onBackgroundReady().then(() => importFromString(jsonString));
-    return;
-  }
-  // create objects in background context
-  const json = BG.tryJSONparse(jsonString) || [];
-  if (typeof json.slice != 'function') {
-    json.length = 0;
-  }
-  const oldStyles = json.length && BG.deepCopy(BG.cachedStyles.list || []);
-  const oldStylesByName = json.length && new Map(
-    oldStyles.map(style => [style.name.trim(), style]));
-
-  const stats = {
-    added:       {names: [], ids: [], legend: 'importReportLegendAdded'},
-    unchanged:   {names: [], ids: [], legend: 'importReportLegendIdentical'},
-    metaAndCode: {names: [], ids: [], legend: 'importReportLegendUpdatedBoth'},
-    metaOnly:    {names: [], ids: [], legend: 'importReportLegendUpdatedMeta'},
-    codeOnly:    {names: [], ids: [], legend: 'importReportLegendUpdatedCode'},
-    invalid:     {names: [], legend: 'importReportLegendInvalid'},
-  };
-
-  let index = 0;
-  let lastRenderTime = performance.now();
-  const renderQueue = [];
-  const RENDER_NAP_TIME_MAX = 1000; // ms
-  const RENDER_QUEUE_MAX = 50; // number of styles
-  const SAVE_OPTIONS = {reason: 'import', notify: false};
-
-  return new Promise(proceed);
-
-  function proceed(resolve) {
-    while (index < json.length) {
-      const item = json[index++];
-      const info = analyze(item);
-      if (info) {
-        // using saveStyle directly since json was parsed in background page context
-        return BG.saveStyle(Object.assign(item, SAVE_OPTIONS))
-          .then(style => account({style, info, resolve}));
-      }
-    }
-    renderQueue.forEach(style => handleUpdate(style, {reason: 'import'}));
-    renderQueue.length = 0;
-    done(resolve);
-  }
-
-  function analyze(item) {
-    if (!item || !item.name || !item.name.trim() || typeof item != 'object'
-    || (item.sections && typeof item.sections.slice != 'function')) {
-      stats.invalid.names.push(`#${index}: ${limitString(item && item.name || '')}`);
-      return;
-    }
-    item.name = item.name.trim();
-    const byId = BG.cachedStyles.byId.get(item.id);
-    const byName = oldStylesByName.get(item.name);
-    oldStylesByName.delete(item.name);
-    let oldStyle;
-    if (byId) {
-      if (sameStyle(byId, item)) {
-        oldStyle = byId;
-      } else {
-        item.id = null;
-      }
-    }
-    if (!oldStyle && byName) {
-      item.id = byName.id;
-      oldStyle = byName;
-    }
-    const oldStyleKeys = oldStyle && Object.keys(oldStyle);
-    const metaEqual = oldStyleKeys &&
-      oldStyleKeys.length == Object.keys(item).length &&
-      oldStyleKeys.every(k => k == 'sections' || oldStyle[k] === item[k]);
-    const codeEqual = oldStyle && BG.styleSectionsEqual(oldStyle, item);
-    if (metaEqual && codeEqual) {
-      stats.unchanged.names.push(oldStyle.name);
-      stats.unchanged.ids.push(oldStyle.id);
-      return;
-    }
-    return {oldStyle, metaEqual, codeEqual};
-  }
-
-  function sameStyle(oldStyle, newStyle) {
-    return oldStyle.name.trim() === newStyle.name.trim() ||
-      ['updateUrl', 'originalMd5', 'originalDigest']
-        .some(field => oldStyle[field] && oldStyle[field] == newStyle[field]);
-  }
-
-  function account({style, info, resolve}) {
-    renderQueue.push(style);
-    if (performance.now() - lastRenderTime > RENDER_NAP_TIME_MAX
-    || renderQueue.length > RENDER_QUEUE_MAX) {
-      renderQueue.forEach(style => handleUpdate(style, {reason: 'import'}));
-      setTimeout(scrollElementIntoView, 0, $('#style-' + renderQueue.pop().id));
-      renderQueue.length = 0;
-      lastRenderTime = performance.now();
-    }
-    setTimeout(proceed, 0, resolve);
-    const {oldStyle, metaEqual, codeEqual} = info;
-    if (!oldStyle) {
-      stats.added.names.push(style.name);
-      stats.added.ids.push(style.id);
-      return;
-    }
-    if (!metaEqual && !codeEqual) {
-      stats.metaAndCode.names.push(reportNameChange(oldStyle, style));
-      stats.metaAndCode.ids.push(style.id);
-      return;
-    }
-    if (!codeEqual) {
-      stats.codeOnly.names.push(style.name);
-      stats.codeOnly.ids.push(style.id);
-      return;
-    }
-    stats.metaOnly.names.push(reportNameChange(oldStyle, style));
-    stats.metaOnly.ids.push(style.id);
-  }
-
-  function done(resolve) {
-    const numChanged = stats.metaAndCode.names.length +
-      stats.metaOnly.names.length +
-      stats.codeOnly.names.length +
-      stats.added.names.length;
-    Promise.resolve(numChanged && refreshAllTabs()).then(() => {
-      const report = Object.keys(stats)
-        .filter(kind => stats[kind].names.length)
-        .map(kind => {
-          const {ids, names, legend} = stats[kind];
-          const listItemsWithId = (name, i) =>
-            $element({dataset: {id: ids[i]}, textContent: name});
-          const listItems = name =>
-            $element({textContent: name});
-          const block =
-            $element({tag: 'details', dataset: {id: kind}, appendChild: [
-              $element({tag: 'summary', appendChild:
-                $element({tag: 'b', textContent: names.length + ' ' + t(legend)})
-              }),
-              $element({tag: 'small', appendChild:
-                names.map(ids ? listItemsWithId : listItems)
-              }),
-            ]});
-          return block;
-        });
-      scrollTo(0, 0);
-      messageBox({
-        title: t('importReportTitle'),
-        contents: report.length ? report : t('importReportUnchanged'),
-        buttons: [t('confirmOK'), numChanged && t('undo')],
-        onshow:  bindClick,
-      }).then(({button, enter, esc}) => {
-        if (button == 1) {
-          undo();
-        }
-      });
-      resolve(numChanged);
-    });
-  }
-
-  function undo() {
-    const oldStylesById = new Map(oldStyles.map(style => [style.id, style]));
-    const newIds = [
-      ...stats.metaAndCode.ids,
-      ...stats.metaOnly.ids,
-      ...stats.codeOnly.ids,
-      ...stats.added.ids,
-    ];
-    let resolve;
-    index = 0;
-    return new Promise(resolve_ => {
-      resolve = resolve_;
-      undoNextId();
-    }).then(refreshAllTabs)
-      .then(() => messageBox({
-        title: t('importReportUndoneTitle'),
-        contents: newIds.length + ' ' + t('importReportUndone'),
-        buttons: [t('confirmOK')],
-      }));
-    function undoNextId() {
-      if (index == newIds.length) {
-        resolve();
-        return;
-      }
-      const id = newIds[index++];
-      deleteStyleSafe({id, notify: false}).then(id => {
-        const oldStyle = oldStylesById.get(id);
-        if (oldStyle) {
-          saveStyleSafe(Object.assign(oldStyle, SAVE_OPTIONS))
-            .then(undoNextId);
-        } else {
-          undoNextId();
-        }
-      });
-    }
-  }
-
-  function bindClick(box) {
-    const highlightElement = event => {
-      const styleElement = $('#style-' + event.target.dataset.id);
-      if (styleElement) {
-        scrollElementIntoView(styleElement);
-        animateElement(styleElement);
-      }
-    };
-    for (const block of $$('details')) {
-      if (block.dataset.id != 'invalid') {
-        block.style.cursor = 'pointer';
-        block.onclick = highlightElement;
-      }
-    }
-  }
-
-  function limitString(s, limit = 100) {
-    return s.length <= limit ? s : s.substr(0, limit) + '...';
-  }
-
-  function reportNameChange(oldStyle, newStyle) {
-    return newStyle.name != oldStyle.name
-      ? oldStyle.name + ' —> ' + newStyle.name
-      : oldStyle.name;
-  }
-
-  function refreshAllTabs() {
-    return Promise.all([
-      getActiveTab(),
-      getOwnTab(),
-    ]).then(([activeTab, ownTab]) => new Promise(resolve => {
-      // list all tabs including chrome-extension:// which can be ours
-      queryTabs().then(tabs => {
-        const lastTab = tabs[tabs.length - 1];
-        for (const tab of tabs) {
-          // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
-          if (FIREFOX && !tab.width) {
-            if (tab == lastTab) {
-              resolve();
-            }
-            continue;
-          }
-          getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
-            const message = {method: 'styleReplaceAll', styles};
-            if (tab.id == ownTab.id) {
-              applyOnMessage(message);
-            } else {
-              invokeOrPostpone(tab.id == activeTab.id,
-                chrome.tabs.sendMessage, tab.id, message, ignoreChromeError);
-            }
-            setTimeout(BG.updateIcon, 0, tab, styles);
-            if (tab == lastTab) {
-              resolve();
-            }
-          });
-        }
-      });
-    }));
-  }
-}
-
-
-$('#file-all-styles').onclick = () => {
-  getStylesSafe().then(styles => {
-    const text = JSON.stringify(styles, null, '\t');
-    const url = 'data:text/plain;charset=utf-8,' + encodeURIComponent(text);
-    return url;
-    // for long URLs; https://github.com/schomery/stylus/issues/13#issuecomment-284582600
-  }).then(fetch)
-    .then(res => res.blob())
-    .then(blob => {
-      const objectURL = URL.createObjectURL(blob);
-      let link = $element({
-        tag:'a',
-        href: objectURL,
-        type: 'application/json',
-        download: generateFileName(),
-      });
-      // TODO: remove the fallback when FF multi-process bug is fixed
-      if (!FIREFOX) {
-        link.dispatchEvent(new MouseEvent('click'));
-        setTimeout(() => URL.revokeObjectURL(objectURL));
-      } else {
-        const iframe = document.body.appendChild($element({
-          tag: 'iframe',
-          style: 'width: 0; height: 0; position: fixed; opacity: 0;'.replace(/;/g, '!important;'),
-        }));
-        doTimeout().then(() => {
-          link = iframe.contentDocument.importNode(link, true);
-          iframe.contentDocument.body.appendChild(link);
-        })
-        .then(doTimeout)
-        .then(() => link.dispatchEvent(new MouseEvent('click')))
-        .then(doTimeout(1000))
-        .then(() => {
-          URL.revokeObjectURL(objectURL);
-          iframe.remove();
-        });
-      }
-    });
-
-  function generateFileName() {
-    const today = new Date();
-    const dd = ('0' + today.getDate()).substr(-2);
-    const mm = ('0' + (today.getMonth() + 1)).substr(-2);
-    const yyyy = today.getFullYear();
-    return `stylus-${mm}-${dd}-${yyyy}${STYLUS_BACKUP_FILE_EXT}`;
-  }
-};
-
-
 $('#unfile-all-styles').onclick = () => {
   importFromFile({fileTypeFilter: STYLUS_BACKUP_FILE_EXT});
 };

From 4cbd48b9f959fe2c81cb47e641c92fa247388551 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Fri, 14 Jul 2017 03:25:33 -0500
Subject: [PATCH 81/94] Rename options.html & fix path

---
 js/messaging.js            | 2 +-
 manifest.json              | 2 +-
 index.html => options.html | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename index.html => options.html (100%)

diff --git a/js/messaging.js b/js/messaging.js
index ac529c92..a1e1c4b0 100644
--- a/js/messaging.js
+++ b/js/messaging.js
@@ -11,7 +11,7 @@ const URLS = {
   ownOrigin: chrome.runtime.getURL(''),
 
   optionsUI: [
-    chrome.runtime.getURL('options/index.html'),
+    chrome.runtime.getURL('options.html'),
     'chrome://extensions/?options=' + chrome.runtime.id,
   ],
 
diff --git a/manifest.json b/manifest.json
index 2070b4ba..958f5a5e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -62,7 +62,7 @@
   },
   "default_locale": "en",
   "options_ui": {
-    "page": "index.html",
+    "page": "options.html",
     "chrome_style": true
   }
 }
diff --git a/index.html b/options.html
similarity index 100%
rename from index.html
rename to options.html

From 61327bfaf1f7826bacd0912d3e782ced29844fa4 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Fri, 14 Jul 2017 03:33:59 -0500
Subject: [PATCH 82/94] Restore case declarations in edit.js

---
 edit/edit.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/edit/edit.js b/edit/edit.js
index ed9dd8d6..7e1d4856 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -295,13 +295,13 @@ function acmeEventListener(event) {
     return;
   }
   let value = el.type == 'checkbox' ? el.checked : el.value;
-  let url;
-  const themeLink = document.getElementById('cm-theme');
   switch (option) {
     case 'tabSize':
       CodeMirror.setOption('indentUnit', Number(value));
       break;
+    /* eslint-disable no-case-declarations */
     case 'theme':
+      const themeLink = document.getElementById('cm-theme');
       // use non-localized 'default' internally
       if (!value || value == 'default' || value == t('defaultTheme')) {
         value = 'default';
@@ -312,7 +312,7 @@ function acmeEventListener(event) {
         el.selectedIndex = 0;
         break;
       }
-      url = chrome.runtime.getURL('vendor/codemirror/theme/' + value + '.css');
+      const url = chrome.runtime.getURL('vendor/codemirror/theme/' + value + '.css');
       if (themeLink.href == url) { // preloaded in initCodeMirror()
         break;
       }
@@ -327,6 +327,7 @@ function acmeEventListener(event) {
         }, 100);
       })();
       return;
+    /* eslint-enable no-case-declarations */
     case 'autocompleteOnTyping':
       editors.forEach(cm => {
         const onOff = el.checked ? 'on' : 'off';

From 1a630033bd5b7b00e8a9a4cb5f4d50abf20b40f6 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Fri, 14 Jul 2017 03:46:10 -0500
Subject: [PATCH 83/94] Use a single declaration per line

---
 background/storage.js                          |  6 ++++--
 edit/edit.js                                   | 11 +++++++----
 vendor-overwrites/beautify/beautify-css-mod.js |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/background/storage.js b/background/storage.js
index 0791d6b3..00b4f392 100644
--- a/background/storage.js
+++ b/background/storage.js
@@ -189,7 +189,8 @@ function filterStylesInternal({
 
   const needSections = asHash || matchUrl !== null;
 
-  for (let i = 0, style; (style = styles[i]); i++) {
+  let style;
+  for (let i = 0; (style = styles[i]); i++) {
     if ((enabled === null || style.enabled == enabled)
     && (url === null || style.url == url)
     && (id === null || style.id == id)) {
@@ -230,7 +231,8 @@ function saveStyle(style) {
   if (!style.name) {
     delete style.name;
   }
-  let existed, codeIsUpdated;
+  let existed;
+  let codeIsUpdated;
   if (reason == 'update' || reason == 'update-digest') {
     return calcStyleDigest(style).then(digest => {
       style.originalDigest = digest;
diff --git a/edit/edit.js b/edit/edit.js
index 7e1d4856..6997f63c 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -602,8 +602,8 @@ function addSection(event, section) {
 }
 
 function removeAppliesTo(event) {
-  const appliesTo = event.target.parentNode,
-    appliesToList = appliesTo.parentNode;
+  const appliesTo = event.target.parentNode;
+  const appliesToList = appliesTo.parentNode;
   removeAreaAndSetDirty(appliesTo);
   if (!appliesToList.hasChildNodes()) {
     addAppliesTo(appliesToList);
@@ -744,7 +744,8 @@ function setupGlobalSearch() {
       && searchAppliesTo(activeCM)) {
       return;
     }
-    for (let i = 0, cm = activeCM; i < editors.length; i++) {
+    let cm = activeCM;
+    for (let i = 0; i < editors.length; i++) {
       state = updateState(cm);
       if (!cm.hasFocus()) {
         pos = reverse ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(0, 0);
@@ -799,7 +800,9 @@ function setupGlobalSearch() {
   }
 
   function replace(activeCM, all) {
-    let queue, query, replacement;
+    let queue;
+    let query;
+    let replacement;
     activeCM = focusClosestCM(activeCM);
     customizeOpenDialog(activeCM, template[all ? 'replaceAll' : 'replace'], function(txt) {
       query = txt;
diff --git a/vendor-overwrites/beautify/beautify-css-mod.js b/vendor-overwrites/beautify/beautify-css-mod.js
index b5baa1fd..a03fd7d8 100644
--- a/vendor-overwrites/beautify/beautify-css-mod.js
+++ b/vendor-overwrites/beautify/beautify-css-mod.js
@@ -364,7 +364,8 @@
                 }
             }
             outputPosCol = 0;
-            let i = output.length, token;
+            let i = output.length;
+            let token;
             while (--i >= 0 && (token = output[i]) != '\n') {
                 outputPosCol += token.length;
             }

From a3e149a30ed1fa6ba06571bcd57ff4ebe6904eb0 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Fri, 14 Jul 2017 03:57:28 -0500
Subject: [PATCH 84/94] Fix & rename scoped state variable

---
 edit/edit.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/edit/edit.js b/edit/edit.js
index 6997f63c..9c4ac192 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -1014,7 +1014,8 @@ function updateLintReport(cm, delay) {
     setTimeout(cm => { cm.performLint(); update(cm); }, delay, cm);
     return;
   }
-  const state = cm.state.lint;
+  // eslint-disable-next-line no-var
+  var state = cm.state.lint;
   if (!state) {
     return;
   }
@@ -1028,13 +1029,12 @@ function updateLintReport(cm, delay) {
     const scope = cm ? [cm] : editors;
     let changed = false;
     let fixedOldIssues = false;
-    let state;
     scope.forEach(function(cm) {
-      state = cm.state.lint || {};
-      const oldMarkers = state.markedLast || {};
+      const scopedState = cm.state.lint || {};
+      const oldMarkers = scopedState.markedLast || {};
       const newMarkers = {};
-      const html = !state.marked || state.marked.length == 0 ? '' : '<tbody>' +
-        state.marked.map(function(mark) {
+      const html = !scopedState.marked || scopedState.marked.length == 0 ? '' : '<tbody>' +
+        scopedState.marked.map(function(mark) {
           const info = mark.__annotation;
           const isActiveLine = info.from.line == cm.getCursor().line;
           const pos = isActiveLine ? 'cursor' : (info.from.line + ',' + info.from.ch);
@@ -1054,10 +1054,10 @@ function updateLintReport(cm, delay) {
             '<td role="col">' + (info.from.ch + 1) + '</td>' +
             '<td role="message">' + message + '</td></tr>';
         }).join('') + '</tbody>';
-      state.markedLast = newMarkers;
-      fixedOldIssues |= state.reportDisplayed && Object.keys(oldMarkers).length > 0;
-      if (state.html != html) {
-        state.html = html;
+      scopedState.markedLast = newMarkers;
+      fixedOldIssues |= scopedState.reportDisplayed && Object.keys(oldMarkers).length > 0;
+      if (scopedState.html != html) {
+        scopedState.html = html;
         changed = true;
       }
     });

From 01e63d5b1a89a18613259073558a930d6ab74841 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Fri, 14 Jul 2017 03:59:13 -0500
Subject: [PATCH 85/94] Remove escaped single quote

---
 edit/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edit/edit.js b/edit/edit.js
index 9c4ac192..c607ad85 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -1073,7 +1073,7 @@ function updateLintReport(cm, delay) {
     }
   }
   function escapeHtml(html) {
-    const chars = {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', '\'': '&#39;', '/': '&#x2F;'};
+    const chars = {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '/': '&#x2F;'};
     return html.replace(/[&<>"'/]/g, function(char) { return chars[char]; });
   }
 }

From 81484bbc37f71decf20aa060d1e8de9752779f19 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Fri, 14 Jul 2017 04:02:04 -0500
Subject: [PATCH 86/94] Fix for-loop index declarations

---
 edit/edit.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/edit/edit.js b/edit/edit.js
index c607ad85..2415642b 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -547,8 +547,7 @@ function addSection(event, section) {
 
   if (section) {
     codeElement.value = section.code;
-    let i;
-    for (i in propertyToCss) {
+    for (const i in propertyToCss) {
       if (section[i]) {
         section[i].forEach(function(url) {
           addAppliesTo(appliesTo, propertyToCss[i], url);
@@ -1234,8 +1233,7 @@ function init() {
     // This is an add
     tE('heading', 'addStyleTitle');
     const section = {code: ''};
-    let i;
-    for (i in CssToProperty) {
+    for (const i in CssToProperty) {
       if (params[i]) {
         section[CssToProperty[i]] = [params[i]];
       }
@@ -1518,8 +1516,7 @@ function showMozillaFormat() {
 function toMozillaFormat() {
   return getSectionsHashes().map(function(section) {
     let cssMds = [];
-    let i;
-    for (i in propertyToCss) {
+    for (const i in propertyToCss) {
       if (section[i]) {
         cssMds = cssMds.concat(section[i].map(function(v) {
           return propertyToCss[i] + '("' + v.replace(/\\/g, '\\\\') + '")';

From 11d8687af7bc6c3c54cca762a0d8540e074b2e86 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Fri, 14 Jul 2017 04:42:55 -0500
Subject: [PATCH 87/94] Wrap case statement to fix eslint issue

---
 edit/edit.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/edit/edit.js b/edit/edit.js
index 2415642b..53053f95 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -299,8 +299,7 @@ function acmeEventListener(event) {
     case 'tabSize':
       CodeMirror.setOption('indentUnit', Number(value));
       break;
-    /* eslint-disable no-case-declarations */
-    case 'theme':
+    case 'theme': {
       const themeLink = document.getElementById('cm-theme');
       // use non-localized 'default' internally
       if (!value || value == 'default' || value == t('defaultTheme')) {
@@ -327,7 +326,7 @@ function acmeEventListener(event) {
         }, 100);
       })();
       return;
-    /* eslint-enable no-case-declarations */
+    }
     case 'autocompleteOnTyping':
       editors.forEach(cm => {
         const onOff = el.checked ? 'on' : 'off';

From a1bec922ef0b372b6e249a43a4fee55e967b21ed Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sun, 16 Jul 2017 08:55:16 -0500
Subject: [PATCH 88/94] Update eslint rules

---
 .eslintrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index c1fb1656..04989f20 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -132,7 +132,7 @@ rules:
   no-duplicate-imports: [2]
   no-else-return: [0]
   no-empty-character-class: [2]
-  no-empty-function: [0]
+  no-empty-function: [1]
   no-empty-pattern: [2]
   no-empty: [2, {allowEmptyCatch: true}]
   no-eq-null: [2]
@@ -166,7 +166,7 @@ rules:
   no-mixed-operators: [0]
   no-mixed-requires: [2, true]
   no-mixed-spaces-and-tabs: [2]
-  no-multi-spaces: [0]
+  no-multi-spaces: [2, {ignoreEOLComments: true}]
   no-multi-str: [2]
   no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}]
   no-native-reassign: [2]
@@ -249,7 +249,7 @@ rules:
   sort-imports: [0]
   sort-keys: [0]
   space-before-blocks: [2, always]
-  space-before-function-paren: [1, never]
+  space-before-function-paren: [2, {anonymous: always, asyncArrow: always, named: never}]
   space-in-parens: [2, never]
   space-infix-ops: [2]
   space-unary-ops: [2]

From 1940318f0fc21b67fb06209a84104b61e8d13ff4 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sun, 16 Jul 2017 11:49:31 -0500
Subject: [PATCH 89/94] Fix eslint issues & use arrow functions

---
 content/install.js |   4 +-
 edit/edit.js       | 213 ++++++++++++++++++++++-----------------------
 manage/manage.js   |   2 +-
 options/index.js   |   2 +-
 popup/popup.js     |   2 +-
 5 files changed, 110 insertions(+), 113 deletions(-)

diff --git a/content/install.js b/content/install.js
index f8bba479..89600266 100644
--- a/content/install.js
+++ b/content/install.js
@@ -22,14 +22,14 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
 
 // TODO: remove the following statement when USO is fixed
 document.documentElement.appendChild(document.createElement('script')).text = '(' +
-  function() {
+  function () {
     let settings;
     document.addEventListener('stylusFixBuggyUSOsettings', function _({detail}) {
       document.removeEventListener('stylusFixBuggyUSOsettings', _);
       settings = /\?/.test(detail) && new URLSearchParams(new URL(detail).search);
     });
     const originalResponseJson = Response.prototype.json;
-    Response.prototype.json = function(...args) {
+    Response.prototype.json = function (...args) {
       return originalResponseJson.call(this, ...args).then(json => {
         Response.prototype.json = originalResponseJson;
         if (!settings || typeof ((json || {}).style_settings || {}).every != 'function') {
diff --git a/edit/edit.js b/edit/edit.js
index 53053f95..6eb0406b 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -16,7 +16,7 @@ const CssToProperty = {'url': 'urls', 'url-prefix': 'urlPrefixes', 'domain': 'do
 onBackgroundReady();
 
 // make querySelectorAll enumeration code readable
-['forEach', 'some', 'indexOf', 'map'].forEach(function(method) {
+['forEach', 'some', 'indexOf', 'map'].forEach(method => {
   NodeList.prototype[method] = Array.prototype[method];
 });
 
@@ -24,7 +24,7 @@ onBackgroundReady();
 Element.prototype.matches = Element.prototype.matches || Element.prototype.webkitMatchesSelector;
 
 // Chrome pre-41 polyfill
-Element.prototype.closest = Element.prototype.closest || function(selector) {
+Element.prototype.closest = Element.prototype.closest || function (selector) {
   let e;
   // eslint-disable-next-line no-empty
   for (e = this; e && !e.matches(selector); e = e.parentElement) {}
@@ -32,14 +32,14 @@ Element.prototype.closest = Element.prototype.closest || function(selector) {
 };
 
 // eslint-disable-next-line no-extend-native
-Array.prototype.rotate = function(amount) { // negative amount == rotate left
+Array.prototype.rotate = function (amount) { // negative amount == rotate left
   const r = this.slice(-amount, this.length);
   Array.prototype.push.apply(r, this.slice(0, this.length - r.length));
   return r;
 };
 
 // eslint-disable-next-line no-extend-native
-Object.defineProperty(Array.prototype, 'last', {get: function() { return this[this.length - 1]; }});
+Object.defineProperty(Array.prototype, 'last', {get: function () { return this[this.length - 1]; }});
 
 // preload the theme so that CodeMirror can calculate its metrics in DOMContentLoaded->setupLivePrefs()
 new MutationObserver((mutations, observer) => {
@@ -60,12 +60,12 @@ const hotkeyRerouter = {
     find: true, findNext: true, findPrev: true, replace: true, replaceAll: true,
     toggleStyle: true,
   },
-  setState: function(enable) {
-    setTimeout(function() {
+  setState: enable => {
+    setTimeout(() => {
       document[(enable ? 'add' : 'remove') + 'EventListener']('keydown', hotkeyRerouter.eventHandler);
     }, 0);
   },
-  eventHandler: function(event) {
+  eventHandler: event => {
     const keyName = CodeMirror.keyName(event);
     if (
       CodeMirror.lookupKey(keyName, CodeMirror.getOption('keyMap'), handleCommand) == 'handled' ||
@@ -139,7 +139,7 @@ function setCleanGlobal() {
 }
 
 function setCleanSection(section) {
-  section.querySelectorAll('.style-contributor').forEach(function(node) { setCleanItem(node, true); });
+  section.querySelectorAll('.style-contributor').forEach(node => { setCleanItem(node, true); });
 
   // #header section has no codemirror
   const cm = section.CodeMirror;
@@ -182,10 +182,10 @@ function initCodeMirror() {
 
   // additional commands
   CM.commands.jumpToLine = jumpToLine;
-  CM.commands.nextEditor = function(cm) { nextPrevEditor(cm, 1); };
-  CM.commands.prevEditor = function(cm) { nextPrevEditor(cm, -1); };
+  CM.commands.nextEditor = cm => { nextPrevEditor(cm, 1); };
+  CM.commands.prevEditor = cm => { nextPrevEditor(cm, -1); };
   CM.commands.save = save;
-  CM.commands.blockComment = function(cm) {
+  CM.commands.blockComment = cm => {
     cm.blockComment(cm.getCursor('from'), cm.getCursor('to'), {fullLines: false});
   };
   CM.commands.toggleStyle = toggleStyle;
@@ -193,7 +193,7 @@ function initCodeMirror() {
   // 'basic' keymap only has basic keys by design, so we skip it
 
   const extraKeysCommands = {};
-  Object.keys(CM.defaults.extraKeys).forEach(function(key) {
+  Object.keys(CM.defaults.extraKeys).forEach(key => {
     extraKeysCommands[CM.defaults.extraKeys[key]] = true;
   });
   if (!extraKeysCommands.jumpToLine) {
@@ -222,18 +222,18 @@ function initCodeMirror() {
     }
 
     // try to remap non-interceptable Ctrl-(Shift-)N/T/W hotkeys
-    ['N', 'T', 'W'].forEach(function(char) {
+    ['N', 'T', 'W'].forEach(char => {
       [{from: 'Ctrl-', to: ['Alt-', 'Ctrl-Alt-']},
        {from: 'Shift-Ctrl-', to: ['Ctrl-Alt-', 'Shift-Ctrl-Alt-']} // Note: modifier order in CM is S-C-A
-      ].forEach(function(remap) {
+      ].forEach(remap => {
         const oldKey = remap.from + char;
-        Object.keys(CM.keyMap).forEach(function(keyMapName) {
+        Object.keys(CM.keyMap).forEach(keyMapName => {
           const keyMap = CM.keyMap[keyMapName];
           const command = keyMap[oldKey];
           if (!command) {
             return;
           }
-          remap.to.some(function(newMod) {
+          remap.to.some(newMod => {
             const newKey = newMod + char;
             if (!(newKey in keyMap)) {
               delete keyMap[oldKey];
@@ -247,23 +247,21 @@ function initCodeMirror() {
   }
 
   // user option values
-  CM.getOption = function(o) {
-    return CodeMirror.defaults[o];
-  };
-  CM.setOption = function(o, v) {
+  CM.getOption = o => CodeMirror.defaults[o];
+  CM.setOption = (o, v) => {
     CodeMirror.defaults[o] = v;
-    editors.forEach(function(editor) {
+    editors.forEach(editor => {
       editor.setOption(o, v);
     });
   };
 
-  CM.prototype.getSection = function() {
+  CM.prototype.getSection = function () {
     return this.display.wrapper.parentNode;
   };
 
   // initialize global editor controls
   function optionsHtmlFromArray(options) {
-    return options.map(function(opt) { return '<option>' + opt + '</option>'; }).join('');
+    return options.map(opt => '<option>' + opt + '</option>').join('');
   }
   const themeControl = document.getElementById('editor.theme');
   const themeList = localStorage.codeMirrorThemes;
@@ -318,8 +316,8 @@ function acmeEventListener(event) {
       // avoid flicker: wait for the second stylesheet to load, then apply the theme
       document.head.insertAdjacentHTML('beforeend',
         '<link id="cm-theme2" rel="stylesheet" href="' + url + '">');
-      (function() {
-        setTimeout(function() {
+      (() => {
+        setTimeout(() => {
           CodeMirror.setOption(option, value);
           themeLink.remove();
           document.getElementById('cm-theme2').id = 'cm-theme';
@@ -426,13 +424,13 @@ function getSections() {
 
 // remind Chrome to repaint a previously invisible editor box by toggling any element's transform
 // this bug is present in some versions of Chrome (v37-40 or something)
-document.addEventListener('scroll', function() {
+document.addEventListener('scroll', () => {
   const style = document.getElementById('name').style;
   style.webkitTransform = style.webkitTransform ? '' : 'scale(1)';
 });
 
 // Shift-Ctrl-Wheel scrolls entire page even when mouse is over a code editor
-document.addEventListener('wheel', function(event) {
+document.addEventListener('wheel', event => {
   if (event.shiftKey && event.ctrlKey && !event.altKey && !event.metaKey) {
     // Chrome scrolls horizontally when Shift is pressed but on some PCs this might be different
     window.scrollBy(0, event.deltaX || event.deltaY);
@@ -450,7 +448,7 @@ queryTabs({currentWindow: true}).then(tabs => {
       chrome.windows.update(windowId, prefs.get('windowPosition'));
     }
     if (tabs.length == 1 && window.history.length == 1) {
-      chrome.windows.getAll(function(windows) {
+      chrome.windows.getAll(windows => {
         if (windows.length > 1) {
           sessionStorageHash('saveSizeOnClose').set(windowId, true);
           saveSizeOnClose = true;
@@ -460,7 +458,7 @@ queryTabs({currentWindow: true}).then(tabs => {
       saveSizeOnClose = sessionStorageHash('saveSizeOnClose').value[windowId];
     }
   }
-  chrome.tabs.onRemoved.addListener(function(tabId, info) {
+  chrome.tabs.onRemoved.addListener((tabId, info) => {
     sessionStorageHash('manageStylesHistory').unset(tabId);
     if (info.windowId == windowId && info.isWindowClosing) {
       sessionStorageHash('saveSizeOnClose').unset(windowId);
@@ -489,7 +487,7 @@ function isWindowMaximized() {
     && window.outerHeight == screen.availHeight;
 }
 
-window.onbeforeunload = function() {
+window.onbeforeunload = () => {
   if (saveSizeOnClose && !isWindowMaximized()) {
     prefs.set('windowPosition', {
       left: screenLeft,
@@ -527,7 +525,7 @@ function addAppliesTo(list, name, value) {
   } else {
     e = template.appliesToEverything.cloneNode(true);
   }
-  e.querySelector('.add-applies-to').addEventListener('click', function() {
+  e.querySelector('.add-applies-to').addEventListener('click', function () {
     addAppliesTo(this.parentNode.parentNode);
   }, false);
   list.appendChild(e);
@@ -548,7 +546,7 @@ function addSection(event, section) {
     codeElement.value = section.code;
     for (const i in propertyToCss) {
       if (section[i]) {
-        section[i].forEach(function(url) {
+        section[i].forEach(url => {
           addAppliesTo(appliesTo, propertyToCss[i], url);
           appliesToAdded = true;
         });
@@ -621,7 +619,7 @@ function removeAreaAndSetDirty(area) {
   if (!contributors.length) {
     setCleanItem(area, false);
   }
-  contributors.some(function(node) {
+  contributors.some(node => {
     if (node.savedValue) {
       // it's a saved section, so make it dirty and stop the enumeration
       setCleanItem(area, false);
@@ -688,11 +686,11 @@ function setupGlobalSearch() {
 
   // temporarily overrides the original openDialog with the provided template's innerHTML
   function customizeOpenDialog(cm, template, callback) {
-    cm.openDialog = function(tmpl, cb, opt) {
+    cm.openDialog = (tmpl, cb, opt) => {
       // invoke 'callback' and bind 'this' to the original callback
       originalOpenDialog.call(cm, template.innerHTML, callback.bind(cb), opt);
     };
-    setTimeout(function() { cm.openDialog = originalOpenDialog; }, 0);
+    setTimeout(() => { cm.openDialog = originalOpenDialog; }, 0);
     refocusMinidialog(cm);
   }
 
@@ -707,13 +705,13 @@ function setupGlobalSearch() {
 
   function find(activeCM) {
     activeCM = focusClosestCM(activeCM);
-    customizeOpenDialog(activeCM, template.find, function(query) {
+    customizeOpenDialog(activeCM, template.find, function (query) {
       this(query);
       curState = activeCM.state.search;
       if (editors.length == 1 || !curState.query) {
         return;
       }
-      editors.forEach(function(cm) {
+      editors.forEach(cm => {
         if (cm != activeCM) {
           cm.execCommand('clearSearch');
           updateState(cm, curState);
@@ -776,14 +774,14 @@ function setupGlobalSearch() {
         inputs = inputs.reverse();
       }
       inputs.splice(0, inputs.indexOf(document.activeElement) + 1);
-      return inputs.some(function(input) {
+      return inputs.some(input => {
         const match = rxQuery.exec(input.value);
         if (match) {
           input.focus();
           const end = match.index + match[0].length;
           // scroll selected part into view in long inputs,
           // works only outside of current event handlers chain, hence timeout=0
-          setTimeout(function() {
+          setTimeout(() => {
             input.setSelectionRange(end, end);
             input.setSelectionRange(match.index, end);
           }, 0);
@@ -802,9 +800,9 @@ function setupGlobalSearch() {
     let query;
     let replacement;
     activeCM = focusClosestCM(activeCM);
-    customizeOpenDialog(activeCM, template[all ? 'replaceAll' : 'replace'], function(txt) {
+    customizeOpenDialog(activeCM, template[all ? 'replaceAll' : 'replace'], txt => {
       query = txt;
-      customizeOpenDialog(activeCM, template.replaceWith, function(txt) {
+      customizeOpenDialog(activeCM, template.replaceWith, txt => {
         replacement = txt;
         queue = editors.rotate(-editors.indexOf(activeCM));
         if (all) {
@@ -826,8 +824,8 @@ function setupGlobalSearch() {
         return;
       }
       // hide the first two dialogs (replace, replaceWith)
-      cm.openDialog = function(tmpl, callback, opt) {
-        cm.openDialog = function(tmpl, callback, opt) {
+      cm.openDialog = (tmpl, callback, opt) => {
+        cm.openDialog = (tmpl, callback, opt) => {
           cm.openDialog = originalOpenDialog;
           if (all) {
             callback(replacement);
@@ -848,25 +846,23 @@ function setupGlobalSearch() {
       let wrapAround = false;
       const origPos = cm.getCursor();
       cm.openConfirm = function overrideConfirm(tmpl, callbacks, opt) {
-        const ovrCallbacks = callbacks.map(function(callback) {
-          return function() {
-            makeSectionVisible(cm);
-            cm.openConfirm = overrideConfirm;
-            setTimeout(function() { cm.openConfirm = originalOpenConfirm; }, 0);
+        const ovrCallbacks = callbacks.map(callback => () => {
+          makeSectionVisible(cm);
+          cm.openConfirm = overrideConfirm;
+          setTimeout(() => { cm.openConfirm = originalOpenConfirm; }, 0);
 
-            const pos = cm.getCursor();
-            callback();
-            const cmp = CodeMirror.cmpPos(cm.getCursor(), pos);
-            wrapAround |= cmp <= 0;
+          const pos = cm.getCursor();
+          callback();
+          const cmp = CodeMirror.cmpPos(cm.getCursor(), pos);
+          wrapAround |= cmp <= 0;
 
-            const dlg = cm.getWrapperElement().querySelector('.CodeMirror-dialog');
-            if (!dlg || cmp == 0 || wrapAround && CodeMirror.cmpPos(cm.getCursor(), origPos) >= 0) {
-              if (dlg) {
-                dlg.remove();
-              }
-              doReplace();
+          const dlg = cm.getWrapperElement().querySelector('.CodeMirror-dialog');
+          if (!dlg || cmp == 0 || wrapAround && CodeMirror.cmpPos(cm.getCursor(), origPos) >= 0) {
+            if (dlg) {
+              dlg.remove();
             }
-          };
+            doReplace();
+          }
         });
         originalOpenConfirm.call(cm, template.replaceConfirm.innerHTML, ovrCallbacks, opt);
       };
@@ -887,7 +883,7 @@ function setupGlobalSearch() {
 function jumpToLine(cm) {
   const cur = cm.getCursor();
   refocusMinidialog(cm);
-  cm.openDialog(template.jumpToLine.innerHTML, function(str) {
+  cm.openDialog(template.jumpToLine.innerHTML, str => {
     const m = str.match(/^\s*(\d+)(?:\s*:\s*(\d+))?\s*$/);
     if (m) {
       cm.setCursor(m[1] - 1, m[2] ? m[2] - 1 : cur.ch);
@@ -959,7 +955,7 @@ function refocusMinidialog(cm) {
   // close the currently opened minidialog
   cm.focus();
   // make sure to focus the input in newly opened minidialog
-  setTimeout(function() {
+  setTimeout(() => {
     section.querySelector('.CodeMirror-dialog').focus();
   }, 0);
 }
@@ -980,8 +976,8 @@ function getEditorInSight(nearbyElement) {
   }
   if (!cm || offscreenDistance(cm) > 0) {
     const sorted = editors
-      .map(function(cm, index) { return {cm: cm, distance: offscreenDistance(cm), index: index}; })
-      .sort(function(a, b) { return a.distance - b.distance || a.index - b.index; });
+      .map((cm, index) => ({cm: cm, distance: offscreenDistance(cm), index: index}))
+      .sort((a, b) => a.distance - b.distance || a.index - b.index);
     cm = sorted[0].cm;
     if (sorted[0].distance > 0) {
       makeSectionVisible(cm);
@@ -1027,12 +1023,12 @@ function updateLintReport(cm, delay) {
     const scope = cm ? [cm] : editors;
     let changed = false;
     let fixedOldIssues = false;
-    scope.forEach(function(cm) {
+    scope.forEach(cm => {
       const scopedState = cm.state.lint || {};
       const oldMarkers = scopedState.markedLast || {};
       const newMarkers = {};
       const html = !scopedState.marked || scopedState.marked.length == 0 ? '' : '<tbody>' +
-        scopedState.marked.map(function(mark) {
+        scopedState.marked.map(mark => {
           const info = mark.__annotation;
           const isActiveLine = info.from.line == cm.getCursor().line;
           const pos = isActiveLine ? 'cursor' : (info.from.line + ',' + info.from.ch);
@@ -1064,7 +1060,7 @@ function updateLintReport(cm, delay) {
       if (!state || !state.postponeNewIssues || fixedOldIssues) {
         renderLintReport(true);
       } else {
-        state.renderTimeout = setTimeout(function() {
+        state.renderTimeout = setTimeout(() => {
           renderLintReport(true);
         }, CodeMirror.defaults.lintReportDelay);
       }
@@ -1072,7 +1068,7 @@ function updateLintReport(cm, delay) {
   }
   function escapeHtml(html) {
     const chars = {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '/': '&#x2F;'};
-    return html.replace(/[&<>"'/]/g, function(char) { return chars[char]; });
+    return html.replace(/[&<>"'/]/g, char => chars[char]);
   }
 }
 
@@ -1082,7 +1078,7 @@ function renderLintReport(someBlockChanged) {
   const label = t('sectionCode');
   const newContent = content.cloneNode(false);
   let issueCount = 0;
-  editors.forEach(function(cm, index) {
+  editors.forEach((cm, index) => {
     if (cm.state.lint && cm.state.lint.html) {
       const newBlock = newContent.appendChild(document.createElement('table'));
       const html = '<caption>' + label + ' ' + (index + 1) + '</caption>' + cm.state.lint.html;
@@ -1165,9 +1161,9 @@ function beautify(event) {
 
     const undoButton = document.querySelector('#help-popup button[role="undo"]');
     undoButton.textContent = t(scope.length == 1 ? 'undo' : 'undoGlobal');
-    undoButton.addEventListener('click', function() {
+    undoButton.addEventListener('click', () => {
       let undoable = false;
-      scope.forEach(function(cm) {
+      scope.forEach(cm => {
         if (cm.beautifyChange && cm.beautifyChange[cm.changeGeneration()]) {
           delete cm.beautifyChange[cm.changeGeneration()];
           cm.undo();
@@ -1178,8 +1174,8 @@ function beautify(event) {
       undoButton.disabled = !undoable;
     });
 
-    scope.forEach(function(cm) {
-      setTimeout(function() {
+    scope.forEach(cm => {
+      setTimeout(() => {
         const pos = options.translate_positions =
           [].concat.apply([], cm.doc.sel.ranges.map(r =>
             [Object.assign({}, r.anchor), Object.assign({}, r.head)]));
@@ -1283,7 +1279,7 @@ function initWithStyle({style, codeIsUpdated}) {
   }
 
   // if this was done in response to an update, we need to clear existing sections
-  getSections().forEach(function(div) { div.remove(); });
+  getSections().forEach(div => { div.remove(); });
   const queue = style.sections.length ? style.sections.slice() : [{code: ''}];
   const queueStart = new Date().getTime();
   // after 100ms the sections will be added asynchronously
@@ -1310,7 +1306,7 @@ function initWithStyle({style, codeIsUpdated}) {
 }
 
 function initHooks() {
-  document.querySelectorAll('#header .style-contributor').forEach(function(node) {
+  document.querySelectorAll('#header .style-contributor').forEach(node => {
     node.addEventListener('change', onChange);
     node.addEventListener('input', onChange);
   });
@@ -1378,7 +1374,7 @@ function maximizeCodeHeight(sectionDiv, isLast) {
   }
   stats.totalHeight += stats.firstSectionTop;
   if (stats.totalHeight <= window.innerHeight) {
-    editors.forEach(function(cm, index) {
+    editors.forEach((cm, index) => {
       cm.setSize(null, stats.deltas[index] + stats.cmActualHeight);
     });
     return;
@@ -1390,10 +1386,10 @@ function maximizeCodeHeight(sectionDiv, isLast) {
   if (available <= 0) {
     return;
   }
-  const totalDelta = stats.deltas.reduce(function(sum, d) { return sum + d; }, 0);
+  const totalDelta = stats.deltas.reduce((sum, d) => sum + d, 0);
   const q = available / totalDelta;
   const baseHeight = stats.cmActualHeight - stats.sectionMarginTop;
-  stats.deltas.forEach(function(delta, index) {
+  stats.deltas.forEach((delta, index) => {
     editors[index].setSize(null, baseHeight + Math.floor(q * delta));
   });
 }
@@ -1413,8 +1409,8 @@ function validate() {
     return t('styleMissingName');
   }
   // validate the regexps
-  if (document.querySelectorAll('.applies-to-list').some(function(list) {
-    return list.childNodes.some(function(li) {
+  if (document.querySelectorAll('.applies-to-list').some(list => {
+    list.childNodes.some(li => {
       if (li.className == template.appliesToEverything.className) {
         return false;
       }
@@ -1466,7 +1462,7 @@ function save() {
 
 function getSectionsHashes() {
   const sections = [];
-  getSections().forEach(function(div) {
+  getSections().forEach(div => {
     const meta = getMeta(div);
     const code = div.CodeMirror.getValue();
     if (/^\s*$/.test(code) && Object.keys(meta).length == 0) {
@@ -1480,7 +1476,7 @@ function getSectionsHashes() {
 
 function getMeta(e) {
   const meta = {urls: [], urlPrefixes: [], domains: [], regexps: []};
-  e.querySelector('.applies-to-list').childNodes.forEach(function(li) {
+  e.querySelector('.applies-to-list').childNodes.forEach(li => {
     if (li.className == template.appliesToEverything.className) {
       return;
     }
@@ -1513,13 +1509,13 @@ function showMozillaFormat() {
 }
 
 function toMozillaFormat() {
-  return getSectionsHashes().map(function(section) {
+  return getSectionsHashes().map(section => {
     let cssMds = [];
     for (const i in propertyToCss) {
       if (section[i]) {
-        cssMds = cssMds.concat(section[i].map(function(v) {
-          return propertyToCss[i] + '("' + v.replace(/\\/g, '\\\\') + '")';
-        }));
+        cssMds = cssMds.concat(section[i].map(v =>
+          propertyToCss[i] + '("' + v.replace(/\\/g, '\\\\') + '")'
+        ));
       }
     }
     return cssMds.length ? '@-moz-document ' + cssMds.join(', ') + ' {\n' + section.code + '\n}' : section.code;
@@ -1540,9 +1536,9 @@ function fromMozillaFormat() {
   popup.querySelector('[name="import-append"]').addEventListener('click', doImport);
   popup.querySelector('[name="import-replace"]').addEventListener('click', doImport);
 
-  popup.codebox.on('change', function() {
+  popup.codebox.on('change', () => {
     clearTimeout(popup.mozillaTimeout);
-    popup.mozillaTimeout = setTimeout(function() {
+    popup.mozillaTimeout = setTimeout(() => {
       popup.classList.toggle('ready', trimNewLines(popup.codebox.getValue()));
     }, 100);
   });
@@ -1558,7 +1554,7 @@ function fromMozillaFormat() {
     // let oldSectionCount = editors.length;
     let firstAddedCM;
 
-    parser.addListener('startdocument', function(e) {
+    parser.addListener('startdocument', function (e) {
       let outerText = getRange(sectionStack.last.start, (--e.col, e));
       const gapComment = outerText.match(/(\/\*[\s\S]*?\*\/)[\s\n]*$/);
       const section = {code: '', start: backtrackTo(this, parserlib.css.Tokens.LBRACE, 'end')};
@@ -1572,7 +1568,7 @@ function fromMozillaFormat() {
         doAddSection(sectionStack.last);
         sectionStack.last.code = '';
       }
-      e.functions.forEach(function(f) {
+      e.functions.forEach(f => {
         const m = f.match(/^(url|url-prefix|domain|regexp)\((['"]?)(.+?)\2?\)$/);
         const aType = CssToProperty[m[1]];
         const aValue = aType != 'regexps' ? m[3] : m[3].replace(/\\\\/g, '\\');
@@ -1581,7 +1577,7 @@ function fromMozillaFormat() {
       sectionStack.push(section);
     });
 
-    parser.addListener('enddocument', function() {
+    parser.addListener('enddocument', function () {
       const end = backtrackTo(this, parserlib.css.Tokens.RBRACE, 'start');
       const section = sectionStack.pop();
       section.code += getRange(section.start, end);
@@ -1589,14 +1585,14 @@ function fromMozillaFormat() {
       doAddSection(section);
     });
 
-    parser.addListener('endstylesheet', function() {
+    parser.addListener('endstylesheet', () => {
       // add nonclosed outer sections (either broken or the last global one)
       const endOfText = {line: lines.length, col: lines.last.length + 1};
       sectionStack.last.code += getRange(sectionStack.last.start, endOfText);
       sectionStack.forEach(doAddSection);
 
       delete maximizeCodeHeight.stats;
-      editors.forEach(function(cm) {
+      editors.forEach(cm => {
         maximizeCodeHeight(cm.getSection(), cm == editors.last);
       });
 
@@ -1608,7 +1604,7 @@ function fromMozillaFormat() {
       }
     });
 
-    parser.addListener('error', function(e) {
+    parser.addListener('error', e => {
       errors += e.line + ':' + e.col + ' ' + e.message.replace(/ at line \d.+$/, '') + '<br>';
     });
 
@@ -1655,7 +1651,7 @@ function fromMozillaFormat() {
         return false;
       }
       if (replaceOldStyle) {
-        editors.slice(0).reverse().forEach(function(cm) {
+        editors.slice(0).reverse().forEach(cm => {
           removeSection({target: cm.getSection().firstElementChild});
         });
       } else if (!editors.last.getValue()) {
@@ -1699,16 +1695,16 @@ function showToggleStyleHelp() {
 function showKeyMapHelp() {
   const keyMap = mergeKeyMaps({}, prefs.get('editor.keyMap'), CodeMirror.defaults.extraKeys);
   const keyMapSorted = Object.keys(keyMap)
-    .map(function(key) { return {key: key, cmd: keyMap[key]}; })
+    .map(key => ({key: key, cmd: keyMap[key]}))
     .concat([{key: 'Shift-Ctrl-Wheel', cmd: 'scrollWindow'}])
-    .sort(function(a, b) { return a.cmd < b.cmd || (a.cmd == b.cmd && a.key < b.key) ? -1 : 1; });
+    .sort((a, b) => (a.cmd < b.cmd || (a.cmd == b.cmd && a.key < b.key) ? -1 : 1));
   showHelp(t('cm_keyMap') + ': ' + prefs.get('editor.keyMap'),
     '<table class="keymap-list">' +
       '<thead><tr><th><input placeholder="' + t('helpKeyMapHotkey') + '" type="search"></th>' +
         '<th><input placeholder="' + t('helpKeyMapCommand') + '" type="search"></th></tr></thead>' +
-      '<tbody>' + keyMapSorted.map(function(value) {
-        return '<tr><td>' + value.key + '</td><td>' + value.cmd + '</td></tr>';
-      }).join('') +
+      '<tbody>' + keyMapSorted.map(value =>
+        '<tr><td>' + value.key + '</td><td>' + value.cmd + '</td></tr>'
+      ).join('') +
       '</tbody>' +
     '</table>');
 
@@ -1734,12 +1730,13 @@ function showKeyMapHelp() {
     this.value = normalizedKey.replace('-dummy', '');
     filterTable(event);
   }
+
   function filterTable(event) {
     const input = event.target;
     const query = stringAsRegExp(input.value, 'gi');
     const col = input.parentNode.cellIndex;
     inputs[1 - col].value = '';
-    table.tBodies[0].childNodes.forEach(function(row) {
+    table.tBodies[0].childNodes.forEach(row => {
       let cell = row.children[col];
       cell.innerHTML = cell.textContent.replace(query, '<mark>$&</mark>');
       row.style.display = query.test(cell.textContent) ? '' : 'none';
@@ -1753,7 +1750,7 @@ function showKeyMapHelp() {
       if (typeof keyMap == 'string') {
         keyMap = CodeMirror.keyMap[keyMap];
       }
-      Object.keys(keyMap).forEach(function(key) {
+      Object.keys(keyMap).forEach(key => {
         let cmd = keyMap[key];
         // filter out '...', 'attach', etc. (hotkeys start with an uppercase letter)
         if (!merged[key] && !key.match(/^[a-z]/) && cmd != '...') {
@@ -1777,9 +1774,9 @@ function showKeyMapHelp() {
 
 function showLintHelp() {
   showHelp(t('issues'), t('issuesHelp') + '<ul>' +
-    CSSLint.getRules().map(function(rule) {
-      return '<li><b>' + rule.name + '</b><br>' + rule.desc + '</li>';
-    }).join('') + '</ul>'
+    CSSLint.getRules().map(rule =>
+      '<li><b>' + rule.name + '</b><br>' + rule.desc + '</li>'
+    ).join('') + '</ul>'
   );
 }
 
@@ -1932,8 +1929,8 @@ function showCodeMirrorPopup(title, html, options) {
     keyMap: prefs.get('editor.keyMap')
   }, options));
   popup.codebox.focus();
-  popup.codebox.on('focus', function() { hotkeyRerouter.setState(false); });
-  popup.codebox.on('blur', function() { hotkeyRerouter.setState(true); });
+  popup.codebox.on('focus', () => { hotkeyRerouter.setState(false); });
+  popup.codebox.on('blur', () => { hotkeyRerouter.setState(true); });
   return popup;
 }
 
@@ -1943,7 +1940,7 @@ function getParams() {
   if (urlParts.length == 1) {
     return params;
   }
-  urlParts[1].split('&').forEach(function(keyValue) {
+  urlParts[1].split('&').forEach(keyValue => {
     const splitKeyValue = keyValue.split('=', 2);
     params[decodeURIComponent(splitKeyValue[0])] = decodeURIComponent(splitKeyValue[1]);
   });
@@ -1969,7 +1966,7 @@ function onRuntimeMessage(request) {
       break;
     case 'styleDeleted':
       if (styleId && styleId == request.id) {
-        window.onbeforeunload = function() {};
+        window.onbeforeunload = () => {};
         window.close();
         break;
       }
diff --git a/manage/manage.js b/manage/manage.js
index 434e7b49..e8fcb481 100644
--- a/manage/manage.js
+++ b/manage/manage.js
@@ -903,7 +903,7 @@ function reapplyFilter(container = installed) {
       // 3. move the shortest group; repeat 2-3
       if (hidden.len < visible.len && (fullPass || hidden.len % 2)) {
         // 3a. move hidden under the horizon
-        for (let j =  0; j < (fullPass ? hidden.len : 1); j++) {
+        for (let j = 0; j < (fullPass ? hidden.len : 1); j++) {
           const entry = entries[hidden.start];
           installed.insertBefore(entry, horizon);
           horizon = entry;
diff --git a/options/index.js b/options/index.js
index 68e6b955..6404eefb 100644
--- a/options/index.js
+++ b/options/index.js
@@ -65,7 +65,7 @@ function checkUpdates() {
 
 function setupRadioButtons() {
   const sets = {};
-  const onChange = function() {
+  const onChange = function () {
     const newValue = sets[this.name].indexOf(this);
     if (newValue >= 0 && prefs.get(this.name) != newValue) {
       prefs.set(this.name, newValue);
diff --git a/popup/popup.js b/popup/popup.js
index f82b978f..42dd69e3 100644
--- a/popup/popup.js
+++ b/popup/popup.js
@@ -79,7 +79,7 @@ function initPopup(url) {
   }
 
   // action buttons
-  $('#disableAll').onchange = function() {
+  $('#disableAll').onchange = function () {
     installed.classList.toggle('disabled', this.checked);
   };
   setupLivePrefs();

From 24dd0cb562378f5c43c779e0168efd35a5d3479b Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sun, 16 Jul 2017 12:01:39 -0500
Subject: [PATCH 90/94] More cleanup

---
 edit/edit.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/edit/edit.js b/edit/edit.js
index 6eb0406b..f8e63006 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -441,9 +441,11 @@ document.addEventListener('wheel', event => {
 queryTabs({currentWindow: true}).then(tabs => {
   const windowId = tabs[0].windowId;
   if (prefs.get('openEditInWindow')) {
-    if (sessionStorage.saveSizeOnClose
-    && 'left' in prefs.get('windowPosition', {})
-    && !isWindowMaximized()) {
+    if (
+      sessionStorage.saveSizeOnClose &&
+      'left' in prefs.get('windowPosition', {}) &&
+      !isWindowMaximized()
+    ) {
       // window was reopened via Ctrl-Shift-T etc.
       chrome.windows.update(windowId, prefs.get('windowPosition'));
     }
@@ -481,10 +483,10 @@ function goBackToManage(event) {
 }
 
 function isWindowMaximized() {
-  return window.screenLeft == 0
-    && window.screenTop == 0
-    && window.outerWidth == screen.availWidth
-    && window.outerHeight == screen.availHeight;
+  return window.screenLeft == 0 &&
+    window.screenTop == 0 &&
+    window.outerWidth == screen.availWidth &&
+    window.outerHeight == screen.availHeight;
 }
 
 window.onbeforeunload = () => {
@@ -570,8 +572,10 @@ function addSection(event, section) {
       item.querySelector('.applies-value').value.trim());
     div.classList.toggle('has-regexp', show);
     appliesTo.oninput = appliesTo.oninput || show && (event => {
-      if (event.target.matches('.applies-value')
-      && event.target.parentElement.querySelector('.applies-type').value == 'regexp') {
+      if (
+        event.target.matches('.applies-value') &&
+        event.target.parentElement.querySelector('.applies-type').value == 'regexp'
+      ) {
         showRegExpTester(null, div);
       }
     });
@@ -736,8 +740,11 @@ function setupGlobalSearch() {
     const rxQuery = typeof state.query == 'object'
       ? state.query : stringAsRegExp(state.query, shouldIgnoreCase(state.query) ? 'i' : '');
 
-    if (document.activeElement && document.activeElement.name == 'applies-value'
-      && searchAppliesTo(activeCM)) {
+    if (
+      document.activeElement &&
+      document.activeElement.name == 'applies-value' &&
+      searchAppliesTo(activeCM)
+    ) {
       return;
     }
     let cm = activeCM;

From 417e3b5de3424d8b6b2e53c1168ee945938beef5 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sun, 16 Jul 2017 13:02:00 -0500
Subject: [PATCH 91/94] Add eqeqeq definition to eslint

---
 .eslintrc                |   2 +-
 background/background.js |  22 +++----
 background/storage.js    |  54 +++++++--------
 background/update.js     |  10 +--
 content/apply.js         |  18 ++---
 content/install.js       |  30 ++++-----
 edit/edit.js             | 138 +++++++++++++++++++--------------------
 js/dom.js                |   8 +--
 js/localization.js       |  12 ++--
 js/messaging.js          |  24 +++----
 js/prefs.js              |  30 ++++-----
 manage/fileSaveLoad.js   |  30 ++++-----
 manage/manage.js         |  76 ++++++++++-----------
 msgbox/msgbox.js         |   6 +-
 options/index.js         |   2 +-
 popup/popup.js           |  16 ++---
 16 files changed, 240 insertions(+), 238 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 04989f20..2e335468 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -82,7 +82,7 @@ rules:
   dot-location: [2, property]
   dot-notation: [0]
   eol-last: [2]
-  eqeqeq: [0]
+  eqeqeq: [1, always]
   func-call-spacing: [2, never]
   func-name-matching: [0]
   func-names: [0]
diff --git a/background/background.js b/background/background.js
index fc5a7f30..3b4f1aa7 100644
--- a/background/background.js
+++ b/background/background.js
@@ -33,7 +33,7 @@ chrome.tabs.onAttached.addListener((tabId, data) => {
     if (tab.url.startsWith(URLS.ownOrigin + 'edit.html')) {
       chrome.windows.get(tab.windowId, {populate: true}, win => {
         // If there's only one tab in this window, it's been dragged to new window
-        prefs.set('openEditInWindow', win.tabs.length == 1);
+        prefs.set('openEditInWindow', win.tabs.length === 1);
       });
     }
   });
@@ -59,13 +59,13 @@ updateIcon({id: undefined}, {});
     const manifest = chrome.runtime.getManifest();
     // Open FAQs page once after installation to guide new users.
     // Do not display it in development mode.
-    if (reason == 'install' && manifest.update_url) {
+    if (reason === 'install' && manifest.update_url) {
       setTimeout(openURL, 100, {
         url: 'http://add0n.com/stylus.html'
       });
     }
     // reset L10N cache on update
-    if (reason == 'update') {
+    if (reason === 'update') {
       localStorage.L10N = JSON.stringify({
         browserUIlanguage: chrome.i18n.getUILanguage(),
       });
@@ -138,7 +138,7 @@ contextMenus = Object.assign({
       const item = Object.assign({id}, contextMenus[id]);
       const prefValue = prefs.readOnlyValues[id];
       item.title = chrome.i18n.getMessage(item.title);
-      if (!item.type && typeof prefValue == 'boolean') {
+      if (!item.type && typeof prefValue === 'boolean') {
         item.type = 'checkbox';
         item.checked = prefValue;
       }
@@ -151,7 +151,7 @@ contextMenus = Object.assign({
   };
   createContextMenus();
   prefs.subscribe((id, checked) => {
-    if (id == 'editor.contextDelete') {
+    if (id === 'editor.contextDelete') {
       if (checked) {
         createContextMenus([id]);
       } else {
@@ -160,7 +160,7 @@ contextMenus = Object.assign({
     } else {
       chrome.contextMenus.update(id, {checked}, ignoreChromeError);
     }
-  }, Object.keys(contextMenus).filter(key => typeof prefs.readOnlyValues[key] == 'boolean'));
+  }, Object.keys(contextMenus).filter(key => typeof prefs.readOnlyValues[key] === 'boolean'));
 }
 
 // *************************************************************************
@@ -176,7 +176,7 @@ contextMenus = Object.assign({
         .replace(/\*/g, '.*?'), flags);
   for (const cs of contentScripts) {
     cs.matches = cs.matches.map(m => (
-      m == ALL_URLS ? m : wildcardAsRegExp(m)
+      m === ALL_URLS ? m : wildcardAsRegExp(m)
     ));
   }
 
@@ -191,8 +191,8 @@ contextMenus = Object.assign({
 
   const pingCS = (cs, {id, url}) => {
     cs.matches.some(match => {
-      if ((match == ALL_URLS || url.match(match))
-        && (!url.startsWith('chrome') || url == NTP)) {
+      if ((match === ALL_URLS || url.match(match))
+        && (!url.startsWith('chrome') || url === NTP)) {
         chrome.tabs.sendMessage(id, PING, pong => {
           if (!pong) {
             injectCS(cs, id);
@@ -229,7 +229,7 @@ function webNavigationListener(method, {url, tabId, frameId}) {
       });
     }
     // main page frame id is 0
-    if (frameId == 0) {
+    if (frameId === 0) {
       updateIcon({id: tabId, url}, styles);
     }
   });
@@ -258,7 +258,7 @@ function updateIcon(tab, styles) {
       }
     }
     const disableAll = 'disableAll' in styles ? styles.disableAll : prefs.get('disableAll');
-    const postfix = disableAll ? 'x' : numStyles == 0 ? 'w' : '';
+    const postfix = disableAll ? 'x' : numStyles === 0 ? 'w' : '';
     const color = prefs.get(disableAll ? 'badgeDisabled' : 'badgeNormal');
     const text = prefs.get('show-badge') && numStyles ? String(numStyles) : '';
     const iconset = ['', 'light/'][prefs.get('iconset')] || '';
diff --git a/background/storage.js b/background/storage.js
index 00b4f392..7531f0fb 100644
--- a/background/storage.js
+++ b/background/storage.js
@@ -63,7 +63,7 @@ function dbExec(method, data) {
         reject(event);
       },
       onupgradeneeded(event) {
-        if (event.oldVersion == 0) {
+        if (event.oldVersion === 0) {
           event.target.result.createObjectStore('styles', {
             keyPath: 'id',
             autoIncrement: true,
@@ -111,15 +111,17 @@ function filterStyles({
   asHash = null,
   strictRegexp = true, // used by the popup to detect bad regexps
 } = {}) {
-  enabled = enabled === null || typeof enabled == 'boolean' ? enabled :
-    typeof enabled == 'string' ? enabled == 'true' : null;
+  enabled = enabled === null || typeof enabled === 'boolean' ? enabled :
+    typeof enabled === 'string' ? enabled === 'true' : null;
   id = id === null ? null : Number(id);
 
-  if (enabled === null
-  && url === null
-  && id === null
-  && matchUrl === null
-  && asHash != true) {
+  if (
+    enabled === null &&
+    url === null &&
+    id === null &&
+    matchUrl === null &&
+    asHash !== true
+  ) {
     return cachedStyles.list;
   }
   const blankHash = asHash && {
@@ -191,9 +193,9 @@ function filterStylesInternal({
 
   let style;
   for (let i = 0; (style = styles[i]); i++) {
-    if ((enabled === null || style.enabled == enabled)
-    && (url === null || style.url == url)
-    && (id === null || style.id == id)) {
+    if ((enabled === null || style.enabled === enabled)
+    && (url === null || style.url === url)
+    && (id === null || style.id === id)) {
       const sections = needSections &&
         getApplicableSections({style, matchUrl, strictRegexp, stopOnFirst: !asHash});
       if (asHash) {
@@ -233,16 +235,16 @@ function saveStyle(style) {
   }
   let existed;
   let codeIsUpdated;
-  if (reason == 'update' || reason == 'update-digest') {
+  if (reason === 'update' || reason === 'update-digest') {
     return calcStyleDigest(style).then(digest => {
       style.originalDigest = digest;
       return decide();
     });
   }
-  if (reason == 'import') {
+  if (reason === 'import') {
     style.originalDigest = style.originalDigest || style.styleDigest; // TODO: remove in the future
     delete style.styleDigest; // TODO: remove in the future
-    if (typeof style.originalDigest != 'string' || style.originalDigest.length != 40) {
+    if (typeof style.originalDigest !== 'string' || style.originalDigest.length !== 40) {
       delete style.originalDigest;
     }
   }
@@ -255,7 +257,7 @@ function saveStyle(style) {
       return dbExec('get', id).then((event, store) => {
         const oldStyle = event.target.result;
         existed = Boolean(oldStyle);
-        if (reason == 'update-digest' && oldStyle.originalDigest == style.originalDigest) {
+        if (reason === 'update-digest' && oldStyle.originalDigest === style.originalDigest) {
           return style;
         }
         codeIsUpdated = !existed || 'sections' in style && !styleSectionsEqual(style, oldStyle);
@@ -289,7 +291,7 @@ function saveStyle(style) {
   }
 
   function done(event) {
-    if (reason == 'update-digest') {
+    if (reason === 'update-digest') {
       return style;
     }
     style.id = style.id || event.target.result;
@@ -367,14 +369,14 @@ function getApplicableSections({style, matchUrl, strictRegexp = true, stopOnFirs
   function arraySomeMatches(array, matchUrl, strictRegexp) {
     for (const regexp of array) {
       for (let pass = 1; pass <= (strictRegexp ? 1 : 2); pass++) {
-        const cacheKey = pass == 1 ? regexp : SLOPPY_REGEXP_PREFIX + regexp;
+        const cacheKey = pass === 1 ? regexp : SLOPPY_REGEXP_PREFIX + regexp;
         let rx = cachedStyles.regexps.get(cacheKey);
-        if (rx == false) {
+        if (rx === false) {
           // invalid regexp
           break;
         }
         if (!rx) {
-          const anchored = pass == 1 ? '^(?:' + regexp + ')$' : '^' + regexp + '$';
+          const anchored = pass === 1 ? '^(?:' + regexp + ')$' : '^' + regexp + '$';
           rx = tryRegExp(anchored);
           cachedStyles.regexps.set(cacheKey, rx || false);
           if (!rx) {
@@ -415,7 +417,7 @@ function styleSectionsEqual({sections: a}, {sections: b}) {
   if (!a || !b) {
     return undefined;
   }
-  if (a.length != b.length) {
+  if (a.length !== b.length) {
     return false;
   }
   const checkedInB = [];
@@ -432,16 +434,16 @@ function styleSectionsEqual({sections: a}, {sections: b}) {
         return false;
       }
     }
-    return equalOrEmpty(secA.code, secB.code, 'substr', (a, b) => a == b);
+    return equalOrEmpty(secA.code, secB.code, 'substr', (a, b) => a === b);
   }
 
   function equalOrEmpty(a, b, telltale, comparator) {
-    const typeA = a && typeof a[telltale] == 'function';
-    const typeB = b && typeof b[telltale] == 'function';
+    const typeA = a && typeof a[telltale] === 'function';
+    const typeB = b && typeof b[telltale] === 'function';
     return (
       (a === null || a === undefined || (typeA && !a.length)) &&
       (b === null || b === undefined || (typeB && !b.length))
-    ) || typeA && typeB && a.length == b.length && comparator(a, b);
+    ) || typeA && typeB && a.length === b.length && comparator(a, b);
   }
 
   function arrayMirrors(array1, array2) {
@@ -525,12 +527,12 @@ function cleanupCachedFilters({force = false} = {}) {
 
 
 function getDomains(url) {
-  if (url.indexOf('file:') == 0) {
+  if (url.indexOf('file:') === 0) {
     return [];
   }
   let d = /.*?:\/*([^/:]+)/.exec(url)[1];
   const domains = [d];
-  while (d.indexOf('.') != -1) {
+  while (d.indexOf('.') !== -1) {
     d = d.substring(d.indexOf('.') + 1);
     domains.push(d);
   }
diff --git a/background/update.js b/background/update.js
index a536098c..04f368f5 100644
--- a/background/update.js
+++ b/background/update.js
@@ -68,17 +68,17 @@ var updater = {
       });
 
     function maybeFetchMd5(digest) {
-      if (!ignoreDigest && style.originalDigest && style.originalDigest != digest) {
+      if (!ignoreDigest && style.originalDigest && style.originalDigest !== digest) {
         return Promise.reject(updater.EDITED);
       }
       return download(style.md5Url);
     }
 
     function maybeFetchCode(md5) {
-      if (!md5 || md5.length != 32) {
+      if (!md5 || md5.length !== 32) {
         return Promise.reject(updater.ERROR_MD5);
       }
-      if (md5 == style.originalMd5 && style.originalDigest && !ignoreDigest) {
+      if (md5 === style.originalMd5 && style.originalDigest && !ignoreDigest) {
         return Promise.reject(updater.SAME_MD5);
       }
       return download(style.updateUrl);
@@ -109,8 +109,8 @@ var updater = {
       return json
         && json.sections
         && json.sections.length
-        && typeof json.sections.every == 'function'
-        && typeof json.sections[0].code == 'string';
+        && typeof json.sections.every === 'function'
+        && typeof json.sections[0].code === 'string';
     }
   },
 
diff --git a/content/apply.js b/content/apply.js
index 6e310f05..0cb626e0 100644
--- a/content/apply.js
+++ b/content/apply.js
@@ -28,7 +28,7 @@ function requestStyles(options, callback = applyStyles) {
     // dynamic about: and javascript: iframes don't have an URL yet
     // so we'll try the parent frame which is guaranteed to have a real URL
     try {
-      if (window != parent) {
+      if (window !== parent) {
         matchUrl = parent.location.href;
       }
     } catch (e) {}
@@ -49,7 +49,7 @@ function requestStyles(options, callback = applyStyles) {
 
 
 function applyOnMessage(request, sender, sendResponse) {
-  if (request.styles == 'DIY') {
+  if (request.styles === 'DIY') {
     // Do-It-Yourself tells our built-in pages to fetch the styles directly
     // which is faster because IPC messaging JSON-ifies everything internally
     requestStyles({}, styles => {
@@ -114,7 +114,7 @@ function doDisableAll(disable = disableAll) {
   disableAll = disable;
   Array.prototype.forEach.call(document.styleSheets, stylesheet => {
     if (stylesheet.ownerNode.matches(`STYLE.stylus[id^="${ID_PREFIX}"]`)
-    && stylesheet.disabled != disable) {
+    && stylesheet.disabled !== disable) {
       stylesheet.disabled = disable;
     }
   });
@@ -122,14 +122,14 @@ function doDisableAll(disable = disableAll) {
 
 
 function doExposeIframes(state = exposeIframes) {
-  if (state === exposeIframes || window == parent) {
+  if (state === exposeIframes || window === parent) {
     return;
   }
   exposeIframes = state;
   const attr = document.documentElement.getAttribute('stylus-iframe');
-  if (state && attr != '') {
+  if (state && attr !== '') {
     document.documentElement.setAttribute('stylus-iframe', '');
-  } else if (!state && attr == '') {
+  } else if (!state && attr === '') {
     document.documentElement.removeAttribute('stylus-iframe');
   }
 }
@@ -193,7 +193,7 @@ function applyStyles(styles) {
   }
   if (document.head
   && document.head.firstChild
-  && document.head.firstChild.id == 'xml-viewer-style') {
+  && document.head.firstChild.id === 'xml-viewer-style') {
     // when site response is application/xml Chrome displays our style elements
     // under document.documentElement as plain text so we need to move them into HEAD
     // which is already autogenerated at this moment
@@ -293,7 +293,7 @@ function initDocRewriteObserver() {
     for (let m = mutations.length; --m >= 0;) {
       const added = mutations[m].addedNodes;
       for (let n = added.length; --n >= 0;) {
-        if (added[n].localName == 'html') {
+        if (added[n].localName === 'html') {
           reinjectStyles();
           return;
         }
@@ -303,7 +303,7 @@ function initDocRewriteObserver() {
   docRewriteObserver.observe(document, {childList: true});
   // detect dynamic iframes rewritten after creation by the embedder i.e. externally
   setTimeout(() => {
-    if (document.documentElement != ROOT) {
+    if (document.documentElement !== ROOT) {
       reinjectStyles();
     }
   });
diff --git a/content/install.js b/content/install.js
index 89600266..0445af7f 100644
--- a/content/install.js
+++ b/content/install.js
@@ -15,7 +15,7 @@ document.addEventListener('stylishInstallOpera', onInstallClicked);
 
 chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
   // orphaned content script check
-  if (msg.method == 'ping') {
+  if (msg.method === 'ping') {
     sendResponse(true);
   }
 });
@@ -32,7 +32,7 @@ document.documentElement.appendChild(document.createElement('script')).text = '(
     Response.prototype.json = function (...args) {
       return originalResponseJson.call(this, ...args).then(json => {
         Response.prototype.json = originalResponseJson;
-        if (!settings || typeof ((json || {}).style_settings || {}).every != 'function') {
+        if (!settings || typeof ((json || {}).style_settings || {}).every !== 'function') {
           return json;
         }
         const images = new Map();
@@ -46,18 +46,18 @@ document.documentElement.appendChild(document.createElement('script')).text = '(
           if (value.startsWith('ik-')) {
             value = value.replace(/^ik-/, '');
             const defaultItem = jsonSetting.style_setting_options.find(item => item.default);
-            if (!defaultItem || defaultItem.install_key != value) {
+            if (!defaultItem || defaultItem.install_key !== value) {
               if (defaultItem) {
                 defaultItem.default = false;
               }
               jsonSetting.style_setting_options.some(item => {
-                if (item.install_key == value) {
+                if (item.install_key === value) {
                   item.default = true;
                   return true;
                 }
               });
             }
-          } else if (jsonSetting.setting_type == 'image') {
+          } else if (jsonSetting.setting_type === 'image') {
             jsonSetting.style_setting_options.some(item => {
               if (item.default) {
                 item.default = false;
@@ -67,7 +67,7 @@ document.documentElement.appendChild(document.createElement('script')).text = '(
             images.set(jsonSetting.install_key, value);
           } else {
             const item = jsonSetting.style_setting_options[0];
-            if (item.value !== value && item.install_key == 'placeholder') {
+            if (item.value !== value && item.install_key === 'placeholder') {
               item.value = value;
             }
           }
@@ -151,7 +151,7 @@ function checkUpdatability([installedStyle]) {
   const md5Url = getMeta('stylish-md5-url');
   if (md5Url && installedStyle.md5Url && installedStyle.originalMd5) {
     getResource(md5Url).then(md5 => {
-      reportUpdatable(md5 != installedStyle.originalMd5);
+      reportUpdatable(md5 !== installedStyle.originalMd5);
     });
   } else {
     getResource(getStyleURL()).then(code => {
@@ -180,7 +180,7 @@ function sendEvent(type, detail = null) {
     type = type.replace('Chrome', 'Opera');
   }
   detail = {detail};
-  if (typeof cloneInto != 'undefined') {
+  if (typeof cloneInto !== 'undefined') {
     // Firefox requires explicit cloning, however USO can't process our messages anyway
     // because USO tries to use a global "event" variable deprecated in Firefox
     detail = cloneInto(detail, document); // eslint-disable-line no-undef
@@ -227,7 +227,7 @@ function saveStyleCode(message, name, addProps) {
           reason: 'update',
         }),
         style => {
-          if (message == 'styleUpdate' && style.updateUrl.includes('?')) {
+          if (message === 'styleUpdate' && style.updateUrl.includes('?')) {
             enableUpdateButton(true);
           } else {
             sendEvent('styleInstalledChrome');
@@ -269,7 +269,7 @@ function styleSectionsEqual({sections: a}, {sections: b}) {
   if (!a || !b) {
     return undefined;
   }
-  if (a.length != b.length) {
+  if (a.length !== b.length) {
     return false;
   }
   const checkedInB = [];
@@ -286,16 +286,16 @@ function styleSectionsEqual({sections: a}, {sections: b}) {
         return false;
       }
     }
-    return equalOrEmpty(secA.code, secB.code, 'substr', (a, b) => a == b);
+    return equalOrEmpty(secA.code, secB.code, 'substr', (a, b) => a === b);
   }
 
   function equalOrEmpty(a, b, telltale, comparator) {
-    const typeA = a && typeof a[telltale] == 'function';
-    const typeB = b && typeof b[telltale] == 'function';
+    const typeA = a && typeof a[telltale] === 'function';
+    const typeB = b && typeof b[telltale] === 'function';
     return (
       (a === null || a === undefined || (typeA && !a.length)) &&
       (b === null || b === undefined || (typeB && !b.length))
-    ) || typeA && typeB && a.length == b.length && comparator(a, b);
+    ) || typeA && typeB && a.length === b.length && comparator(a, b);
   }
 
   function arrayMirrors(array1, array2) {
@@ -315,7 +315,7 @@ function styleSectionsEqual({sections: a}, {sections: b}) {
 
 
 function onDOMready() {
-  if (document.readyState != 'loading') {
+  if (document.readyState !== 'loading') {
     return Promise.resolve();
   }
   return new Promise(resolve => {
diff --git a/edit/edit.js b/edit/edit.js
index f8e63006..8afb891e 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -45,7 +45,7 @@ Object.defineProperty(Array.prototype, 'last', {get: function () { return this[t
 new MutationObserver((mutations, observer) => {
   const themeElement = document.getElementById('cm-theme');
   if (themeElement) {
-    themeElement.href = prefs.get('editor.theme') == 'default' ? ''
+    themeElement.href = prefs.get('editor.theme') === 'default' ? ''
       : 'vendor/codemirror/theme/' + prefs.get('editor.theme') + '.css';
     observer.disconnect();
   }
@@ -68,8 +68,8 @@ const hotkeyRerouter = {
   eventHandler: event => {
     const keyName = CodeMirror.keyName(event);
     if (
-      CodeMirror.lookupKey(keyName, CodeMirror.getOption('keyMap'), handleCommand) == 'handled' ||
-      CodeMirror.lookupKey(keyName, CodeMirror.defaults.extraKeys, handleCommand) == 'handled'
+      CodeMirror.lookupKey(keyName, CodeMirror.getOption('keyMap'), handleCommand) === 'handled' ||
+      CodeMirror.lookupKey(keyName, CodeMirror.defaults.extraKeys, handleCommand) === 'handled'
     ) {
       event.preventDefault();
       event.stopPropagation();
@@ -90,7 +90,7 @@ function onChange(event) {
     setCleanItem(node, node.savedValue === currentValue);
   } else {
     // the manually added section's applies-to is dirty only when the value is non-empty
-    setCleanItem(node, node.localName != 'input' || !node.value.trim());
+    setCleanItem(node, node.localName !== 'input' || !node.value.trim());
     delete node.savedValue; // only valid when actually saved
   }
   updateTitle();
@@ -122,7 +122,7 @@ function setCleanItem(node, isClean) {
 }
 
 function isCleanGlobal() {
-  const clean = Object.keys(dirty).length == 0;
+  const clean = Object.keys(dirty).length === 0;
   setDirtyClass(document.body, !clean);
     // let saveBtn = document.getElementById('save-button')
     // if (clean){
@@ -270,7 +270,7 @@ function initCodeMirror() {
   } else {
     // Chrome is starting up and shows our edit.html, but the background page isn't loaded yet
     const theme = prefs.get('editor.theme');
-    themeControl.innerHTML = optionsHtmlFromArray([theme == 'default' ? t('defaultTheme') : theme]);
+    themeControl.innerHTML = optionsHtmlFromArray([theme === 'default' ? t('defaultTheme') : theme]);
     getCodeMirrorThemes().then(() => {
       const themes = (localStorage.codeMirrorThemes || '').split(/\s+/);
       themeControl.innerHTML = optionsHtmlFromArray(themes);
@@ -292,7 +292,7 @@ function acmeEventListener(event) {
     console.error('acmeEventListener: no "cm_option" %O', el);
     return;
   }
-  let value = el.type == 'checkbox' ? el.checked : el.value;
+  let value = el.type === 'checkbox' ? el.checked : el.value;
   switch (option) {
     case 'tabSize':
       CodeMirror.setOption('indentUnit', Number(value));
@@ -300,9 +300,9 @@ function acmeEventListener(event) {
     case 'theme': {
       const themeLink = document.getElementById('cm-theme');
       // use non-localized 'default' internally
-      if (!value || value == 'default' || value == t('defaultTheme')) {
+      if (!value || value === 'default' || value === t('defaultTheme')) {
         value = 'default';
-        if (prefs.get(el.id) != value) {
+        if (prefs.get(el.id) !== value) {
           prefs.set(el.id, value);
         }
         themeLink.href = '';
@@ -310,7 +310,7 @@ function acmeEventListener(event) {
         break;
       }
       const url = chrome.runtime.getURL('vendor/codemirror/theme/' + value + '.css');
-      if (themeLink.href == url) { // preloaded in initCodeMirror()
+      if (themeLink.href === url) { // preloaded in initCodeMirror()
         break;
       }
       // avoid flicker: wait for the second stylesheet to load, then apply the theme
@@ -337,7 +337,7 @@ function acmeEventListener(event) {
         case 'token':
         case 'selection':
           document.body.dataset[option] = value;
-          value = {showToken: value == 'token' && /[#.\-\w]/, annotateScrollbar: true};
+          value = {showToken: value === 'token' && /[#.\-\w]/, annotateScrollbar: true};
           break;
         default:
           value = null;
@@ -372,7 +372,7 @@ function setupCodeMirror(textarea, index) {
   let lastClickTime = 0;
   const resizeGrip = wrapper.appendChild(template.resizeGrip.cloneNode(true));
   resizeGrip.onmousedown = event => {
-    if (event.button != 0) {
+    if (event.button !== 0) {
       return;
     }
     event.preventDefault();
@@ -390,7 +390,7 @@ function setupCodeMirror(textarea, index) {
     function resize(e) {
       const cmPageY = wrapper.getBoundingClientRect().top + window.scrollY;
       const height = Math.max(minHeight, e.pageY - cmPageY);
-      if (height != wrapper.clientHeight) {
+      if (height !== wrapper.clientHeight) {
         cm.setSize(null, height);
       }
     }
@@ -449,7 +449,7 @@ queryTabs({currentWindow: true}).then(tabs => {
       // window was reopened via Ctrl-Shift-T etc.
       chrome.windows.update(windowId, prefs.get('windowPosition'));
     }
-    if (tabs.length == 1 && window.history.length == 1) {
+    if (tabs.length === 1 && window.history.length === 1) {
       chrome.windows.getAll(windows => {
         if (windows.length > 1) {
           sessionStorageHash('saveSizeOnClose').set(windowId, true);
@@ -462,14 +462,14 @@ queryTabs({currentWindow: true}).then(tabs => {
   }
   chrome.tabs.onRemoved.addListener((tabId, info) => {
     sessionStorageHash('manageStylesHistory').unset(tabId);
-    if (info.windowId == windowId && info.isWindowClosing) {
+    if (info.windowId === windowId && info.isWindowClosing) {
       sessionStorageHash('saveSizeOnClose').unset(windowId);
     }
   });
 });
 
 getActiveTab().then(tab => {
-  useHistoryBack = sessionStorageHash('manageStylesHistory').value[tab.id] == location.href;
+  useHistoryBack = sessionStorageHash('manageStylesHistory').value[tab.id] === location.href;
 });
 
 function goBackToManage(event) {
@@ -483,10 +483,10 @@ function goBackToManage(event) {
 }
 
 function isWindowMaximized() {
-  return window.screenLeft == 0 &&
-    window.screenTop == 0 &&
-    window.outerWidth == screen.availWidth &&
-    window.outerHeight == screen.availHeight;
+  return window.screenLeft === 0 &&
+    window.screenTop === 0 &&
+    window.outerWidth === screen.availWidth &&
+    window.outerHeight === screen.availHeight;
 }
 
 window.onbeforeunload = () => {
@@ -568,13 +568,13 @@ function addSection(event, section) {
   function toggleTestRegExpVisibility() {
     const show = [...appliesTo.children].some(item =>
       !item.matches('.applies-to-everything') &&
-      item.querySelector('.applies-type').value == 'regexp' &&
+      item.querySelector('.applies-type').value === 'regexp' &&
       item.querySelector('.applies-value').value.trim());
     div.classList.toggle('has-regexp', show);
     appliesTo.oninput = appliesTo.oninput || show && (event => {
       if (
         event.target.matches('.applies-value') &&
-        event.target.parentElement.querySelector('.applies-type').value == 'regexp'
+        event.target.parentElement.querySelector('.applies-type').value === 'regexp'
       ) {
         showRegExpTester(null, div);
       }
@@ -666,7 +666,7 @@ function setupGlobalSearch() {
   let curState; // cm.state.search for last used 'find'
 
   function shouldIgnoreCase(query) { // treat all-lowercase non-regexp queries as case-insensitive
-    return typeof query == 'string' && query == query.toLowerCase();
+    return typeof query === 'string' && query === query.toLowerCase();
   }
 
   function updateState(cm, newState) {
@@ -701,7 +701,7 @@ function setupGlobalSearch() {
   function focusClosestCM(activeCM) {
     editors.lastActive = activeCM;
     const cm = getEditorInSight();
-    if (cm != activeCM) {
+    if (cm !== activeCM) {
       cm.focus();
     }
     return cm;
@@ -712,16 +712,16 @@ function setupGlobalSearch() {
     customizeOpenDialog(activeCM, template.find, function (query) {
       this(query);
       curState = activeCM.state.search;
-      if (editors.length == 1 || !curState.query) {
+      if (editors.length === 1 || !curState.query) {
         return;
       }
       editors.forEach(cm => {
-        if (cm != activeCM) {
+        if (cm !== activeCM) {
           cm.execCommand('clearSearch');
           updateState(cm, curState);
         }
       });
-      if (CodeMirror.cmpPos(curState.posFrom, curState.posTo) == 0) {
+      if (CodeMirror.cmpPos(curState.posFrom, curState.posTo) === 0) {
         findNext(activeCM);
       }
     });
@@ -737,12 +737,12 @@ function setupGlobalSearch() {
     let pos = activeCM.getCursor(reverse ? 'from' : 'to');
     activeCM.setSelection(activeCM.getCursor()); // clear the selection, don't move the cursor
 
-    const rxQuery = typeof state.query == 'object'
+    const rxQuery = typeof state.query === 'object'
       ? state.query : stringAsRegExp(state.query, shouldIgnoreCase(state.query) ? 'i' : '');
 
     if (
       document.activeElement &&
-      document.activeElement.name == 'applies-value' &&
+      document.activeElement.name === 'applies-value' &&
       searchAppliesTo(activeCM)
     ) {
       return;
@@ -864,7 +864,7 @@ function setupGlobalSearch() {
           wrapAround |= cmp <= 0;
 
           const dlg = cm.getWrapperElement().querySelector('.CodeMirror-dialog');
-          if (!dlg || cmp == 0 || wrapAround && CodeMirror.cmpPos(cm.getCursor(), origPos) >= 0) {
+          if (!dlg || cmp === 0 || wrapAround && CodeMirror.cmpPos(cm.getCursor(), origPos) >= 0) {
             if (dlg) {
               dlg.remove();
             }
@@ -1006,7 +1006,7 @@ function getEditorInSight(nearbyElement) {
 }
 
 function updateLintReport(cm, delay) {
-  if (delay == 0) {
+  if (delay === 0) {
     // immediately show pending csslint messages in onbeforeunload and save
     update(cm);
     return;
@@ -1024,7 +1024,7 @@ function updateLintReport(cm, delay) {
   // or update it as soon as possible (default: 500ms lint + 100ms) in case an existing issue was just fixed
   clearTimeout(state.reportTimeout);
   state.reportTimeout = setTimeout(update, state.options.delay + 100, cm);
-  state.postponeNewIssues = delay == undefined || delay === null;
+  state.postponeNewIssues = delay === undefined || delay === null;
 
   function update(cm) {
     const scope = cm ? [cm] : editors;
@@ -1034,16 +1034,16 @@ function updateLintReport(cm, delay) {
       const scopedState = cm.state.lint || {};
       const oldMarkers = scopedState.markedLast || {};
       const newMarkers = {};
-      const html = !scopedState.marked || scopedState.marked.length == 0 ? '' : '<tbody>' +
+      const html = !scopedState.marked || scopedState.marked.length === 0 ? '' : '<tbody>' +
         scopedState.marked.map(mark => {
           const info = mark.__annotation;
-          const isActiveLine = info.from.line == cm.getCursor().line;
+          const isActiveLine = info.from.line === cm.getCursor().line;
           const pos = isActiveLine ? 'cursor' : (info.from.line + ',' + info.from.ch);
           let message = escapeHtml(info.message.replace(/ at line \d.+$/, ''));
           if (message.length > 100) {
             message = message.substr(0, 100) + '...';
           }
-          if (isActiveLine || oldMarkers[pos] == message) {
+          if (isActiveLine || oldMarkers[pos] === message) {
             delete oldMarkers[pos];
           }
           newMarkers[pos] = message;
@@ -1057,7 +1057,7 @@ function updateLintReport(cm, delay) {
         }).join('') + '</tbody>';
       scopedState.markedLast = newMarkers;
       fixedOldIssues |= scopedState.reportDisplayed && Object.keys(oldMarkers).length > 0;
-      if (scopedState.html != html) {
+      if (scopedState.html !== html) {
         scopedState.html = html;
         changed = true;
       }
@@ -1094,12 +1094,12 @@ function renderLintReport(someBlockChanged) {
       issueCount += newBlock.rows.length;
 
       const block = content.children[newContent.children.length - 1];
-      const blockChanged = !block || cm != block.cm || html != block.innerHTML;
+      const blockChanged = !block || cm !== block.cm || html !== block.innerHTML;
       someBlockChanged |= blockChanged;
       cm.state.lint.reportDisplayed = blockChanged;
     }
   });
-  if (someBlockChanged || newContent.children.length != content.children.length) {
+  if (someBlockChanged || newContent.children.length !== content.children.length) {
     document.getElementById('issue-count').textContent = issueCount;
     container.replaceChild(newContent, content);
     container.style.display = newContent.children.length ? 'block' : 'none';
@@ -1112,7 +1112,7 @@ function resizeLintReport(event, content) {
   if (content.children.length) {
     const bounds = content.getBoundingClientRect();
     const newMaxHeight = bounds.bottom <= innerHeight ? '' : (innerHeight - bounds.top) + 'px';
-    if (newMaxHeight != content.style.maxHeight) {
+    if (newMaxHeight !== content.style.maxHeight) {
       content.style.maxHeight = newMaxHeight;
     }
   }
@@ -1167,7 +1167,7 @@ function beautify(event) {
       '<div><button role="undo"></button></div>');
 
     const undoButton = document.querySelector('#help-popup button[role="undo"]');
-    undoButton.textContent = t(scope.length == 1 ? 'undo' : 'undoGlobal');
+    undoButton.textContent = t(scope.length === 1 ? 'undo' : 'undoGlobal');
     undoButton.addEventListener('click', () => {
       let undoable = false;
       scope.forEach(cm => {
@@ -1188,7 +1188,7 @@ function beautify(event) {
             [Object.assign({}, r.anchor), Object.assign({}, r.head)]));
         const text = cm.getValue();
         const newText = exports.css_beautify(text, options);
-        if (newText != text) {
+        if (newText !== text) {
           if (!cm.beautifyChange || !cm.beautifyChange[cm.changeGeneration()]) {
             // clear the list if last change wasn't a css-beautify
             cm.beautifyChange = {};
@@ -1206,7 +1206,7 @@ function beautify(event) {
     });
 
     document.querySelector('.beautify-options').onchange = ({target}) => {
-      const value = target.type == 'checkbox' ? target.checked : target.selectedIndex > 0;
+      const value = target.type === 'checkbox' ? target.checked : target.selectedIndex > 0;
       prefs.set('editor.beautify', Object.assign(options, {[target.dataset.option]: value}));
       if (target.parentNode.hasAttribute('newline')) {
         target.parentNode.setAttribute('newline', value.toString());
@@ -1264,7 +1264,7 @@ function init() {
       window.onload = null;
       initWithStyle({style});
     };
-    if (document.readyState != 'loading') {
+    if (document.readyState !== 'loading') {
       window.onload();
     }
   });
@@ -1346,10 +1346,10 @@ function initHooks() {
 
 
 function toggleContextMenuDelete(event) {
-  if (event.button == 2 && prefs.get('editor.contextDelete')) {
+  if (event.button === 2 && prefs.get('editor.contextDelete')) {
     chrome.contextMenus.update('editor.contextDelete', {
       enabled: Boolean(
-        this.selectionStart != this.selectionEnd ||
+        this.selectionStart !== this.selectionEnd ||
         this.somethingSelected && this.somethingSelected()
       ),
     }, ignoreChromeError);
@@ -1412,20 +1412,20 @@ function updateTitle() {
 
 function validate() {
   const name = document.getElementById('name').value;
-  if (name == '') {
+  if (name === '') {
     return t('styleMissingName');
   }
   // validate the regexps
   if (document.querySelectorAll('.applies-to-list').some(list => {
     list.childNodes.some(li => {
-      if (li.className == template.appliesToEverything.className) {
+      if (li.className === template.appliesToEverything.className) {
         return false;
       }
       const valueElement = li.querySelector('[name=applies-value]');
       const type = li.querySelector('[name=applies-type]').value;
       const value = valueElement.value;
       if (type && value) {
-        if (type == 'regexp') {
+        if (type === 'regexp') {
           try {
             new RegExp(value);
           } catch (ex) {
@@ -1472,7 +1472,7 @@ function getSectionsHashes() {
   getSections().forEach(div => {
     const meta = getMeta(div);
     const code = div.CodeMirror.getValue();
-    if (/^\s*$/.test(code) && Object.keys(meta).length == 0) {
+    if (/^\s*$/.test(code) && Object.keys(meta).length === 0) {
       return;
     }
     meta.code = code;
@@ -1484,7 +1484,7 @@ function getSectionsHashes() {
 function getMeta(e) {
   const meta = {urls: [], urlPrefixes: [], domains: [], regexps: []};
   e.querySelector('.applies-to-list').childNodes.forEach(li => {
-    if (li.className == template.appliesToEverything.className) {
+    if (li.className === template.appliesToEverything.className) {
       return;
     }
     const type = li.querySelector('[name=applies-type]').value;
@@ -1502,7 +1502,7 @@ function saveComplete(style) {
   setCleanGlobal();
 
   // Go from new style URL to edit style URL
-  if (location.href.indexOf('id=') == -1) {
+  if (location.href.indexOf('id=') === -1) {
     history.replaceState({}, document.title, 'edit.html?id=' + style.id);
     tE('heading', 'editStyleHeading', null, false);
   }
@@ -1551,7 +1551,7 @@ function fromMozillaFormat() {
   });
 
   function doImport() {
-    const replaceOldStyle = this.name == 'import-replace';
+    const replaceOldStyle = this.name === 'import-replace';
     popup.querySelector('.dismiss').onclick();
     const mozStyle = trimNewLines(popup.codebox.getValue());
     const parser = new parserlib.css.Parser();
@@ -1578,7 +1578,7 @@ function fromMozillaFormat() {
       e.functions.forEach(f => {
         const m = f.match(/^(url|url-prefix|domain|regexp)\((['"]?)(.+?)\2?\)$/);
         const aType = CssToProperty[m[1]];
-        const aValue = aType != 'regexps' ? m[3] : m[3].replace(/\\\\/g, '\\');
+        const aValue = aType !== 'regexps' ? m[3] : m[3].replace(/\\\\/g, '\\');
         (section[aType] = section[aType] || []).push(aValue);
       });
       sectionStack.push(section);
@@ -1600,7 +1600,7 @@ function fromMozillaFormat() {
 
       delete maximizeCodeHeight.stats;
       editors.forEach(cm => {
-        maximizeCodeHeight(cm.getSection(), cm == editors.last);
+        maximizeCodeHeight(cm.getSection(), cm === editors.last);
       });
 
       makeSectionVisible(firstAddedCM);
@@ -1622,7 +1622,7 @@ function fromMozillaFormat() {
       const C1 = start.col - 1;
       const L2 = end.line - 1;
       const C2 = end.col - 1;
-      if (L1 == L2) {
+      if (L1 === L2) {
         return lines[L1].substr(C1, C2 - C1 + 1);
       } else {
         const middle = lines.slice(L1 + 1, L2).join('\n');
@@ -1673,7 +1673,7 @@ function fromMozillaFormat() {
   function backtrackTo(parser, tokenType, startEnd) {
     const tokens = parser._tokenStream._lt;
     for (let i = parser._tokenStream._ltIndex - 1; i >= 0; --i) {
-      if (tokens[i].type == tokenType) {
+      if (tokens[i].type === tokenType) {
         return {line: tokens[i][startEnd + 'Line'], col: tokens[i][startEnd + 'Col']};
       }
     }
@@ -1704,7 +1704,7 @@ function showKeyMapHelp() {
   const keyMapSorted = Object.keys(keyMap)
     .map(key => ({key: key, cmd: keyMap[key]}))
     .concat([{key: 'Shift-Ctrl-Wheel', cmd: 'scrollWindow'}])
-    .sort((a, b) => (a.cmd < b.cmd || (a.cmd == b.cmd && a.key < b.key) ? -1 : 1));
+    .sort((a, b) => (a.cmd < b.cmd || (a.cmd === b.cmd && a.key < b.key) ? -1 : 1));
   showHelp(t('cm_keyMap') + ': ' + prefs.get('editor.keyMap'),
     '<table class="keymap-list">' +
       '<thead><tr><th><input placeholder="' + t('helpKeyMapHotkey') + '" type="search"></th>' +
@@ -1724,7 +1724,7 @@ function showKeyMapHelp() {
 
   function hotkeyHandler(event) {
     const keyName = CodeMirror.keyName(event);
-    if (keyName == 'Esc' || keyName == 'Tab' || keyName == 'Shift-Tab') {
+    if (keyName === 'Esc' || keyName === 'Tab' || keyName === 'Shift-Tab') {
       return;
     }
     event.preventDefault();
@@ -1754,14 +1754,14 @@ function showKeyMapHelp() {
   }
   function mergeKeyMaps(merged, ...more) {
     more.forEach(keyMap => {
-      if (typeof keyMap == 'string') {
+      if (typeof keyMap === 'string') {
         keyMap = CodeMirror.keyMap[keyMap];
       }
       Object.keys(keyMap).forEach(key => {
         let cmd = keyMap[key];
         // filter out '...', 'attach', etc. (hotkeys start with an uppercase letter)
-        if (!merged[key] && !key.match(/^[a-z]/) && cmd != '...') {
-          if (typeof cmd == 'function') {
+        if (!merged[key] && !key.match(/^[a-z]/) && cmd !== '...') {
+          if (typeof cmd === 'function') {
             // for 'emacs' keymap: provide at least something meaningful (hotkeys and the function body)
             // for 'vim*' keymaps: almost nothing as it doesn't rely on CM keymap mechanism
             cmd = cmd.toString().replace(/^function.*?\{[\s\r\n]*([\s\S]+?)[\s\r\n]*\}$/, '$1');
@@ -1795,7 +1795,7 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
   const regexps = [...section.querySelector('.applies-to-list').children]
     .map(item =>
       !item.matches('.applies-to-everything') &&
-      item.querySelector('.applies-type').value == 'regexp' &&
+      item.querySelector('.applies-type').value === 'regexp' &&
       item.querySelector('.applies-value').value.trim())
     .filter(item => item)
     .map(text => {
@@ -1857,7 +1857,7 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
           ? OWN_ICON
           : GET_FAVICON_URL + new URL(url).hostname;
         const icon = `<img src="${faviconUrl}">`;
-        if (match.length == url.length) {
+        if (match.length === url.length) {
           full.push(`<div>${icon + url}</div>`);
         } else {
           partial.push(`<div>${icon}<mark>${match}</mark>` +
@@ -1898,7 +1898,7 @@ function showHelp(title, text) {
   div.querySelector('.contents').innerHTML = text;
   div.querySelector('.title').innerHTML = title;
 
-  if (getComputedStyle(div).display == 'none') {
+  if (getComputedStyle(div).display === 'none') {
     document.addEventListener('keydown', closeHelp);
     div.querySelector('.dismiss').onclick = closeHelp; // avoid chaining on multiple showHelp() calls
   }
@@ -1909,8 +1909,8 @@ function showHelp(title, text) {
   function closeHelp(e) {
     if (
       !e ||
-      e.type == 'click' ||
-      ((e.keyCode || e.which) == 27 && !e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)
+      e.type === 'click' ||
+      ((e.keyCode || e.which) === 27 && !e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)
     ) {
       div.style.display = '';
       document.querySelector('.contents').innerHTML = '';
@@ -1944,7 +1944,7 @@ function showCodeMirrorPopup(title, html, options) {
 function getParams() {
   const params = {};
   const urlParts = location.href.split('?', 2);
-  if (urlParts.length == 1) {
+  if (urlParts.length === 1) {
     return params;
   }
   urlParts[1].split('&').forEach(keyValue => {
@@ -1959,7 +1959,7 @@ chrome.runtime.onMessage.addListener(onRuntimeMessage);
 function onRuntimeMessage(request) {
   switch (request.method) {
     case 'styleUpdated':
-      if (styleId && styleId == request.style.id && request.reason != 'editSave') {
+      if (styleId && styleId === request.style.id && request.reason !== 'editSave') {
         if ((request.style.sections[0] || {}).code === null) {
           // the code-less style came from notifyAllTabs
           onBackgroundReady().then(() => {
@@ -1972,7 +1972,7 @@ function onRuntimeMessage(request) {
       }
       break;
     case 'styleDeleted':
-      if (styleId && styleId == request.id) {
+      if (styleId && styleId === request.id) {
         window.onbeforeunload = () => {};
         window.close();
         break;
diff --git a/js/dom.js b/js/dom.js
index 88fd44b6..6a71a10a 100644
--- a/js/dom.js
+++ b/js/dom.js
@@ -27,7 +27,7 @@ navigator.userAgent.includes('Firefox') && setTimeout(() => {
 
 
 function onDOMready() {
-  if (document.readyState != 'loading') {
+  if (document.readyState !== 'loading') {
     return Promise.resolve();
   }
   return new Promise(resolve => {
@@ -79,9 +79,9 @@ function enforceInputRange(element) {
   const max = Number(element.max);
   const doNotify = () => element.dispatchEvent(new Event('change', {bubbles: true}));
   const onChange = ({type}) => {
-    if (type == 'input' && element.checkValidity()) {
+    if (type === 'input' && element.checkValidity()) {
       doNotify();
-    } else if (type == 'change' && !element.checkValidity()) {
+    } else if (type === 'change' && !element.checkValidity()) {
       element.value = Math.max(min, Math.min(max, Number(element.value)));
       doNotify();
     }
@@ -113,7 +113,7 @@ function $element(opt) {
     ? opt.tag.split('#')
     : [null, opt.tag];
   const element = ns
-    ? document.createElementNS(ns == 'SVG' || ns == 'svg' ? 'http://www.w3.org/2000/svg' : ns, tag)
+    ? document.createElementNS(ns === 'SVG' || ns === 'svg' ? 'http://www.w3.org/2000/svg' : ns, tag)
     : document.createElement(tag || 'div');
   (opt.appendChild instanceof Array ? opt.appendChild : [opt.appendChild])
     .forEach(child => child && element.appendChild(child));
diff --git a/js/localization.js b/js/localization.js
index 0c5f578c..1db7577b 100644
--- a/js/localization.js
+++ b/js/localization.js
@@ -7,7 +7,7 @@ tDocLoader();
 function t(key, params) {
   const cache = !params && t.cache[key];
   const s = cache || chrome.i18n.getMessage(key, params);
-  if (s == '') {
+  if (s === '') {
     throw `Missing string "${key}"`;
   }
   if (!params && !cache) {
@@ -20,7 +20,7 @@ function t(key, params) {
 function tE(id, key, attr, esc) {
   if (attr) {
     document.getElementById(id).setAttribute(attr, t(key));
-  } else if (typeof esc == 'undefined' || esc) {
+  } else if (typeof esc === 'undefined' || esc) {
     document.getElementById(id).appendChild(document.createTextNode(t(key)));
   } else {
     document.getElementById(id).innerHTML = t(key);
@@ -43,10 +43,10 @@ function tNodeList(nodes) {
   for (let n = nodes.length; --n >= 0;) {
     const node = nodes[n];
     // skip non-ELEMENT_NODE
-    if (node.nodeType != 1) {
+    if (node.nodeType !== 1) {
       continue;
     }
-    if (node.localName == 'template') {
+    if (node.localName === 'template') {
       const elements = node.content.querySelectorAll('*');
       tNodeList(elements);
       template[node.dataset.id] = elements[0];
@@ -94,7 +94,7 @@ function tDocLoader() {
 
   // reset L10N cache on UI language change
   const UIlang = chrome.i18n.getUILanguage();
-  if (t.cache.browserUIlanguage != UIlang) {
+  if (t.cache.browserUIlanguage !== UIlang) {
     t.cache = {browserUIlanguage: UIlang};
     localStorage.L10N = JSON.stringify(t.cache);
   }
@@ -114,7 +114,7 @@ function tDocLoader() {
   const onLoad = () => {
     tDocLoader.stop();
     process(observer.takeRecords());
-    if (cacheLength != Object.keys(t.cache).length) {
+    if (cacheLength !== Object.keys(t.cache).length) {
       localStorage.L10N = JSON.stringify(t.cache);
     }
   };
diff --git a/js/messaging.js b/js/messaging.js
index a1e1c4b0..386f7409 100644
--- a/js/messaging.js
+++ b/js/messaging.js
@@ -35,7 +35,7 @@ const URLS = {
 
 let BG = chrome.extension.getBackgroundPage();
 
-if (!BG || BG != window) {
+if (!BG || BG !== window) {
   document.documentElement.classList.toggle('firefox', FIREFOX);
   document.documentElement.classList.toggle('opera', OPERA);
   // TODO: remove once our manifest's minimum_chrome_version is 50+
@@ -47,7 +47,7 @@ if (!BG || BG != window) {
 
 function notifyAllTabs(msg) {
   const originalMessage = msg;
-  if (msg.method == 'styleUpdated' || msg.method == 'styleAdded') {
+  if (msg.method === 'styleUpdated' || msg.method === 'styleAdded') {
     // apply/popup/manage use only meta for these two methods,
     // editor may need the full code but can fetch it directly,
     // so we send just the meta to avoid spamming lots of tabs with huge styles
@@ -86,11 +86,11 @@ function notifyAllTabs(msg) {
     });
   }
   // notify self: the message no longer is sent to the origin in new Chrome
-  if (typeof onRuntimeMessage != 'undefined') {
+  if (typeof onRuntimeMessage !== 'undefined') {
     onRuntimeMessage(originalMessage);
   }
   // notify apply.js on own pages
-  if (typeof applyOnMessage != 'undefined') {
+  if (typeof applyOnMessage !== 'undefined') {
     applyOnMessage(originalMessage);
   }
   // notify background page and all open popups
@@ -134,7 +134,7 @@ function getActiveTabRealURL() {
 
 function getTabRealURL(tab) {
   return new Promise(resolve => {
-    if (tab.url != 'chrome://newtab/') {
+    if (tab.url !== 'chrome://newtab/') {
       resolve(tab.url);
     } else {
       chrome.webNavigation.getFrame({tabId: tab.id, frameId: 0, processId: -1}, frame => {
@@ -159,13 +159,13 @@ function openURL({url, currentWindow = true}) {
     const urlQuery = url.startsWith('moz-extension') ? undefined : url.replace(/#.*/, '');
     queryTabs({url: urlQuery, currentWindow}).then(tabs => {
       for (const tab of tabs) {
-        if (tab.url == url) {
+        if (tab.url === url) {
           activateTab(tab).then(resolve);
           return;
         }
       }
       getActiveTab().then(tab => {
-        if (tab && tab.url == 'chrome://newtab/'
+        if (tab && tab.url === 'chrome://newtab/'
         // prevent redirecting incognito NTP to a chrome URL as it crashes Chrome
         && (!url.startsWith('chrome') || !tab.incognito)) {
           chrome.tabs.update({url}, resolve);
@@ -250,14 +250,14 @@ const debounce = Object.assign((fn, delay, ...args) => {
 
 
 function deepCopy(obj) {
-  return obj !== null && obj !== undefined && typeof obj == 'object'
-    ? deepMerge(typeof obj.slice == 'function' ? [] : {}, obj)
+  return obj !== null && obj !== undefined && typeof obj === 'object'
+    ? deepMerge(typeof obj.slice === 'function' ? [] : {}, obj)
     : obj;
 }
 
 
 function deepMerge(target, ...args) {
-  const isArray = typeof target.slice == 'function';
+  const isArray = typeof target.slice === 'function';
   for (const obj of args) {
     if (isArray && obj !== null && obj !== undefined) {
       for (const element of obj) {
@@ -267,7 +267,7 @@ function deepMerge(target, ...args) {
     }
     for (const k in obj) {
       const value = obj[k];
-      if (k in target && typeof value == 'object' && value !== null) {
+      if (k in target && typeof value === 'object' && value !== null) {
         deepMerge(target[k], value);
       } else {
         target[k] = deepCopy(value);
@@ -346,7 +346,7 @@ function download(url) {
   return new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
     xhr.timeout = 10e3;
-    xhr.onloadend = () => (xhr.status == 200
+    xhr.onloadend = () => (xhr.status === 200
       ? resolve(xhr.responseText)
       : reject(xhr.status));
     const [mainUrl, query] = url.split('?');
diff --git a/js/prefs.js b/js/prefs.js
index c34a0546..2326036b 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -115,10 +115,10 @@ var prefs = new function Prefs() {
       defineReadonlyProperty(this.readOnlyValues, key, value);
       const hasChanged = !equal(value, oldValue);
       if (!fromBroadcast) {
-        if (BG && BG != window) {
+        if (BG && BG !== window) {
           BG.prefs.set(key, BG.deepCopy(value), {broadcast, sync});
         } else {
-          localStorage[key] = typeof defaults[key] == 'object'
+          localStorage[key] = typeof defaults[key] === 'object'
             ? JSON.stringify(value)
             : value;
           if (broadcast && hasChanged) {
@@ -166,7 +166,7 @@ var prefs = new function Prefs() {
   for (const key in defaults) {
     const defaultValue = defaults[key];
     let value = localStorage[key];
-    if (typeof value == 'string') {
+    if (typeof value === 'string') {
       switch (typeof defaultValue) {
         case 'boolean':
           value = value.toLowerCase() === 'true';
@@ -181,7 +181,7 @@ var prefs = new function Prefs() {
     } else {
       value = defaultValue;
     }
-    if (BG == window) {
+    if (BG === window) {
       // when in bg page, .set() will write to localStorage
       this.set(key, value, {broadcast: false, sync: false});
     } else {
@@ -190,13 +190,13 @@ var prefs = new function Prefs() {
     }
   }
 
-  if (!BG || BG == window) {
+  if (!BG || BG === window) {
     affectsIcon.forEach(key => this.broadcast(key, values[key], {sync: false}));
 
     getSync().get('settings', ({settings: synced} = {}) => {
       if (synced) {
         for (const key in defaults) {
-          if (key == 'popupWidth' && synced[key] != values.popupWidth) {
+          if (key === 'popupWidth' && synced[key] !== values.popupWidth) {
             // this is a fix for the period when popupWidth wasn't synced
             // TODO: remove it in a couple of months
             continue;
@@ -209,7 +209,7 @@ var prefs = new function Prefs() {
     });
 
     chrome.storage.onChanged.addListener((changes, area) => {
-      if (area == 'sync' && 'settings' in changes) {
+      if (area === 'sync' && 'settings' in changes) {
         const synced = changes.settings.newValue;
         if (synced) {
           for (const key in defaults) {
@@ -283,21 +283,21 @@ var prefs = new function Prefs() {
 
   function defineReadonlyProperty(obj, key, value) {
     const copy = deepCopy(value);
-    if (typeof copy == 'object') {
+    if (typeof copy === 'object') {
       Object.freeze(copy);
     }
     Object.defineProperty(obj, key, {value: copy, configurable: true});
   }
 
   function equal(a, b) {
-    if (!a || !b || typeof a != 'object' || typeof b != 'object') {
+    if (!a || !b || typeof a !== 'object' || typeof b !== 'object') {
       return a === b;
     }
-    if (Object.keys(a).length != Object.keys(b).length) {
+    if (Object.keys(a).length !== Object.keys(b).length) {
       return false;
     }
     for (const k in a) {
-      if (typeof a[k] == 'object') {
+      if (typeof a[k] === 'object') {
         if (!equal(a[k], b[k])) {
           return false;
         }
@@ -315,7 +315,7 @@ var prefs = new function Prefs() {
       // Chrome and co.
       /Safari\/[\d.]+$/.test(navigator.userAgent) &&
       // skip forks with Flash as those are likely to have the menu e.g. CentBrowser
-      !Array.from(navigator.plugins).some(p => p.name == 'Shockwave Flash')
+      !Array.from(navigator.plugins).some(p => p.name === 'Shockwave Flash')
     );
   }
 }();
@@ -330,7 +330,7 @@ function setupLivePrefs(
   const checkedProps = {};
   for (const id of IDs) {
     const element = document.getElementById(id);
-    checkedProps[id] = element.type == 'checkbox' ? 'checked' : 'value';
+    checkedProps[id] = element.type === 'checkbox' ? 'checked' : 'value';
     updateElement({id, element, force: true});
     element.addEventListener('change', onChange);
   }
@@ -338,7 +338,7 @@ function setupLivePrefs(
 
   function onChange() {
     const value = this[checkedProps[this.id]];
-    if (prefs.get(this.id) != value) {
+    if (prefs.get(this.id) !== value) {
       prefs.set(this.id, value);
     }
   }
@@ -349,7 +349,7 @@ function setupLivePrefs(
     force,
   }) {
     const prop = checkedProps[id];
-    if (force || element[prop] != value) {
+    if (force || element[prop] !== value) {
       element[prop] = value;
       element.dispatchEvent(new Event('change', {bubbles: true, cancelable: true}));
     }
diff --git a/manage/fileSaveLoad.js b/manage/fileSaveLoad.js
index 9d37fc1b..ec54517d 100644
--- a/manage/fileSaveLoad.js
+++ b/manage/fileSaveLoad.js
@@ -53,7 +53,7 @@ function importFromString(jsonString) {
   }
   // create objects in background context
   const json = BG.tryJSONparse(jsonString) || [];
-  if (typeof json.slice != 'function') {
+  if (typeof json.slice !== 'function') {
     json.length = 0;
   }
   const oldStyles = json.length && BG.deepCopy(BG.cachedStyles.list || []);
@@ -94,8 +94,8 @@ function importFromString(jsonString) {
   }
 
   function analyze(item) {
-    if (!item || !item.name || !item.name.trim() || typeof item != 'object'
-    || (item.sections && typeof item.sections.slice != 'function')) {
+    if (!item || !item.name || !item.name.trim() || typeof item !== 'object'
+    || (item.sections && typeof item.sections.slice !== 'function')) {
       stats.invalid.names.push(`#${index}: ${limitString(item && item.name || '')}`);
       return;
     }
@@ -117,8 +117,8 @@ function importFromString(jsonString) {
     }
     const oldStyleKeys = oldStyle && Object.keys(oldStyle);
     const metaEqual = oldStyleKeys &&
-      oldStyleKeys.length == Object.keys(item).length &&
-      oldStyleKeys.every(k => k == 'sections' || oldStyle[k] === item[k]);
+      oldStyleKeys.length === Object.keys(item).length &&
+      oldStyleKeys.every(k => k === 'sections' || oldStyle[k] === item[k]);
     const codeEqual = oldStyle && BG.styleSectionsEqual(oldStyle, item);
     if (metaEqual && codeEqual) {
       stats.unchanged.names.push(oldStyle.name);
@@ -131,7 +131,7 @@ function importFromString(jsonString) {
   function sameStyle(oldStyle, newStyle) {
     return oldStyle.name.trim() === newStyle.name.trim() ||
       ['updateUrl', 'originalMd5', 'originalDigest']
-        .some(field => oldStyle[field] && oldStyle[field] == newStyle[field]);
+        .some(field => oldStyle[field] && oldStyle[field] === newStyle[field]);
   }
 
   function account({style, info, resolve}) {
@@ -196,7 +196,7 @@ function importFromString(jsonString) {
         buttons: [t('confirmOK'), numChanged && t('undo')],
         onshow:  bindClick,
       }).then(({button, enter, esc}) => {
-        if (button == 1) {
+        if (button === 1) {
           undo();
         }
       });
@@ -224,7 +224,7 @@ function importFromString(jsonString) {
         buttons: [t('confirmOK')],
       }));
     function undoNextId() {
-      if (index == newIds.length) {
+      if (index === newIds.length) {
         resolve();
         return;
       }
@@ -250,7 +250,7 @@ function importFromString(jsonString) {
       }
     };
     for (const block of $$('details')) {
-      if (block.dataset.id != 'invalid') {
+      if (block.dataset.id !== 'invalid') {
         block.style.cursor = 'pointer';
         block.onclick = highlightElement;
       }
@@ -262,7 +262,7 @@ function importFromString(jsonString) {
   }
 
   function reportNameChange(oldStyle, newStyle) {
-    return newStyle.name != oldStyle.name
+    return newStyle.name !== oldStyle.name
       ? oldStyle.name + ' —> ' + newStyle.name
       : oldStyle.name;
   }
@@ -278,21 +278,21 @@ function importFromString(jsonString) {
         for (const tab of tabs) {
           // skip lazy-loaded aka unloaded tabs that seem to start loading on message in FF
           if (FIREFOX && !tab.width) {
-            if (tab == lastTab) {
+            if (tab === lastTab) {
               resolve();
             }
             continue;
           }
           getStylesSafe({matchUrl: tab.url, enabled: true, asHash: true}).then(styles => {
             const message = {method: 'styleReplaceAll', styles};
-            if (tab.id == ownTab.id) {
+            if (tab.id === ownTab.id) {
               applyOnMessage(message);
             } else {
-              invokeOrPostpone(tab.id == activeTab.id,
+              invokeOrPostpone(tab.id === activeTab.id,
                 chrome.tabs.sendMessage, tab.id, message, ignoreChromeError);
             }
             setTimeout(BG.updateIcon, 0, tab, styles);
-            if (tab == lastTab) {
+            if (tab === lastTab) {
               resolve();
             }
           });
@@ -359,7 +359,7 @@ $('#unfile-all-styles').onclick = () => {
 Object.assign(document.body, {
   ondragover(event) {
     const hasFiles = event.dataTransfer.types.includes('Files');
-    event.dataTransfer.dropEffect = hasFiles || event.target.type == 'search' ? 'copy' : 'none';
+    event.dataTransfer.dropEffect = hasFiles || event.target.type === 'search' ? 'copy' : 'none';
     this.classList.toggle('dropzone', hasFiles);
     if (hasFiles) {
       event.preventDefault();
diff --git a/manage/manage.js b/manage/manage.js
index e8fcb481..124c7d72 100644
--- a/manage/manage.js
+++ b/manage/manage.js
@@ -73,7 +73,7 @@ function initGlobalEvents() {
 
   // focus search field on / key
   document.onkeypress = event => {
-    if ((event.keyCode || event.which) == 47
+    if ((event.keyCode || event.which) === 47
     && !event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey
     && !event.target.matches('[type="text"], [type="search"]')) {
       event.preventDefault();
@@ -114,7 +114,7 @@ function initGlobalEvents() {
 function showStyles(styles = []) {
   const sorted = styles
     .map(style => ({name: style.name.toLocaleLowerCase(), style}))
-    .sort((a, b) => (a.name < b.name ? -1 : a.name == b.name ? 0 : 1));
+    .sort((a, b) => (a.name < b.name ? -1 : a.name === b.name ? 0 : 1));
   let index = 0;
   const scrollY = (history.state || {}).scrollY;
   const shouldRenderAll = scrollY > window.innerHeight || sessionStorage.justEditedStyleId;
@@ -228,18 +228,18 @@ function createStyleTargetsElement({entry, style, postponeFavicons}) {
         displayed.add(targetValue);
         const element = template.appliesToTarget.cloneNode(true);
         if (!newUI.enabled) {
-          if (numTargets == 10) {
+          if (numTargets === 10) {
             container = container.appendChild(template.extraAppliesTo.cloneNode(true));
           } else if (numTargets > 1) {
             container.appendChild(template.appliesToSeparator.cloneNode(true));
           }
         } else if (newUI.favicons) {
           let favicon = '';
-          if (type == 'domains') {
+          if (type === 'domains') {
             favicon = GET_FAVICON_URL + targetValue;
           } else if (targetValue.startsWith('chrome-extension:')) {
             favicon = OWN_ICON;
-          } else if (type != 'regexps') {
+          } else if (type !== 'regexps') {
             favicon = targetValue.includes('://') && targetValue.match(/^.*?:\/\/([^/]+)/);
             favicon = favicon ? GET_FAVICON_URL + favicon[1] : '';
           }
@@ -292,7 +292,7 @@ Object.assign(handleEvent, {
     const target = event.target;
     const entry = target.closest('.entry');
     for (const selector in handleEvent.ENTRY_ROUTES) {
-      for (let el = target; el && el != entry; el = el.parentElement) {
+      for (let el = target; el && el !== entry; el = el.parentElement) {
         if (el.matches(selector)) {
           const handler = handleEvent.ENTRY_ROUTES[selector];
           return handleEvent[handler].call(el, event, entry);
@@ -307,8 +307,8 @@ Object.assign(handleEvent, {
     }
     event.preventDefault();
     event.stopPropagation();
-    const left = event.button == 0;
-    const middle = event.button == 1;
+    const left = event.button === 0;
+    const middle = event.button === 1;
     const shift = event.shiftKey;
     const ctrl = event.ctrlKey;
     const openWindow = left && shift && !ctrl;
@@ -361,7 +361,7 @@ Object.assign(handleEvent, {
       buttons: [t('confirmDelete'), t('confirmCancel')],
     })
     .then(({button, enter, esc}) => {
-      if (button == 0 || enter) {
+      if (button === 0 || enter) {
         deleteStyleSafe({id});
       }
     });
@@ -386,10 +386,10 @@ Object.assign(handleEvent, {
   },
 
   filterOnChange({target: el, forceRefilter}) {
-    const getValue = el => (el.type == 'checkbox' ? el.checked : el.value.trim());
+    const getValue = el => (el.type === 'checkbox' ? el.checked : el.value.trim());
     if (!forceRefilter) {
       const value = getValue(el);
-      if (value == el.lastValue) {
+      if (value === el.lastValue) {
         return;
       }
       el.lastValue = value;
@@ -415,22 +415,22 @@ Object.assign(handleEvent, {
 function handleUpdate(style, {reason, method} = {}) {
   let entry;
   let oldEntry = $(ENTRY_ID_PREFIX + style.id);
-  if (oldEntry && method == 'styleUpdated') {
+  if (oldEntry && method === 'styleUpdated') {
     handleToggledOrCodeOnly();
   }
   entry = entry || createStyleElement({style});
   if (oldEntry) {
-    if (oldEntry.styleNameLowerCase == entry.styleNameLowerCase) {
+    if (oldEntry.styleNameLowerCase === entry.styleNameLowerCase) {
       installed.replaceChild(entry, oldEntry);
     } else {
       oldEntry.remove();
     }
   }
-  if (reason == 'update' && entry.matches('.updatable')) {
+  if (reason === 'update' && entry.matches('.updatable')) {
     handleUpdateInstalled();
   }
   filterAndAppend({entry});
-  if (!entry.matches('.hidden') && reason != 'import') {
+  if (!entry.matches('.hidden') && reason !== 'import') {
     animateElement(entry);
     scrollElementIntoView(entry);
   }
@@ -438,12 +438,12 @@ function handleUpdate(style, {reason, method} = {}) {
   function handleToggledOrCodeOnly() {
     const newStyleMeta = getStyleWithNoCode(style);
     const diff = objectDiff(oldEntry.styleMeta, newStyleMeta);
-    if (diff.length == 0) {
+    if (diff.length === 0) {
       // only code was modified
       entry = oldEntry;
       oldEntry = null;
     }
-    if (diff.length == 1 && diff[0].key == 'enabled') {
+    if (diff.length === 1 && diff[0].key === 'enabled') {
       oldEntry.classList.toggle('enabled', style.enabled);
       oldEntry.classList.toggle('disabled', !style.enabled);
       $$('.checker', oldEntry).forEach(el => (el.checked = style.enabled));
@@ -481,8 +481,8 @@ function switchUI({styleOnly} = {}) {
   // ensure the global option is processed first
   for (const el of [$('#manage.newUI'), ...$$('[id^="manage.newUI."]')]) {
     const id = el.id.replace(/^manage\.newUI\.?/, '') || 'enabled';
-    const value = el.type == 'checkbox' ? el.checked : Number(el.value);
-    const valueChanged = value !== newUI[id] && (id == 'enabled' || current.enabled);
+    const value = el.type === 'checkbox' ? el.checked : Number(el.value);
+    const valueChanged = value !== newUI[id] && (id === 'enabled' || current.enabled);
     current[id] = value;
     changed[id] = valueChanged;
     someChanged |= valueChanged;
@@ -568,7 +568,7 @@ function checkUpdateAll() {
   $('#apply-all-updates').classList.add('hidden');
   $('#update-all-no-updates').classList.add('hidden');
 
-  const ignoreDigest = this && this.id == 'check-all-updates-force';
+  const ignoreDigest = this && this.id === 'check-all-updates-force';
   $$('.updatable:not(.can-update)' + (ignoreDigest ? '' : ':not(.update-problem)'))
     .map(el => checkUpdate(el, {single: false}));
 
@@ -585,7 +585,7 @@ function checkUpdateAll() {
         total = value;
         break;
       case BG.updater.UPDATED:
-        if (++updated == 1) {
+        if (++updated === 1) {
           $('#apply-all-updates').disabled = true;
           $('#apply-all-updates').classList.remove('hidden');
         }
@@ -593,7 +593,7 @@ function checkUpdateAll() {
         // fallthrough
       case BG.updater.SKIPPED:
         checked++;
-        if (details == BG.updater.EDITED || details == BG.updater.MAYBE_EDITED) {
+        if (details === BG.updater.EDITED || details === BG.updater.MAYBE_EDITED) {
           skippedEdited++;
         }
         reportUpdateState(state, value, details);
@@ -606,13 +606,13 @@ function checkUpdateAll() {
 
   function done() {
     document.body.classList.remove('update-in-progress');
-    $('#check-all-updates').disabled = total == 0;
+    $('#check-all-updates').disabled = total === 0;
     $('#apply-all-updates').disabled = false;
     renderUpdatesOnlyFilter({check: updated + skippedEdited > 0});
     if (!updated) {
       $('#update-all-no-updates').dataset.skippedEdited = skippedEdited > 0;
       $('#update-all-no-updates').classList.remove('hidden');
-      $('#check-all-updates-force').classList.toggle('hidden', skippedEdited == 0);
+      $('#check-all-updates-force').classList.toggle('hidden', skippedEdited === 0);
     }
   }
 }
@@ -648,16 +648,16 @@ function reportUpdateState(state, style, details) {
       if (entry.classList.contains('can-update')) {
         break;
       }
-      const same = details == BG.updater.SAME_MD5 || details == BG.updater.SAME_CODE;
-      const edited = details == BG.updater.EDITED || details == BG.updater.MAYBE_EDITED;
+      const same = details === BG.updater.SAME_MD5 || details === BG.updater.SAME_CODE;
+      const edited = details === BG.updater.EDITED || details === BG.updater.MAYBE_EDITED;
       entry.dataset.details = details;
       if (!details) {
         details = t('updateCheckFailServerUnreachable');
-      } else if (typeof details == 'number') {
+      } else if (typeof details === 'number') {
         details = t('updateCheckFailBadResponseCode', [details]);
-      } else if (details == BG.updater.EDITED) {
+      } else if (details === BG.updater.EDITED) {
         details = t('updateCheckSkippedLocallyEdited') + '\n' + t('updateCheckManualUpdateHint');
-      } else if (details == BG.updater.MAYBE_EDITED) {
+      } else if (details === BG.updater.MAYBE_EDITED) {
         details = t('updateCheckSkippedMaybeLocallyEdited') + '\n' + t('updateCheckManualUpdateHint');
       }
       const message = same ? t('updateCheckSucceededNoUpdate') : details;
@@ -719,7 +719,7 @@ function searchStyles({immediately, container}) {
   const searchElement = $('#search');
   const query = searchElement.value.toLocaleLowerCase();
   const queryPrev = searchElement.lastValue || '';
-  if (query == queryPrev && !immediately && !container) {
+  if (query === queryPrev && !immediately && !container) {
     return;
   }
   if (!immediately) {
@@ -741,7 +741,7 @@ function searchStyles({immediately, container}) {
         style.url && isMatchingText(style.url) ||
         isMatchingStyle(style)));
     }
-    if (entry.classList.contains('not-matching') != !isMatching) {
+    if (entry.classList.contains('not-matching') !== !isMatching) {
       entry.classList.toggle('not-matching', !isMatching);
       needsRefilter = true;
     }
@@ -850,7 +850,7 @@ function reapplyFilter(container = installed) {
   shuffle(false);
   setTimeout(shuffle, 0, true);
   // single-element job from handleEvent(): add the last wraith
-  if (toHide.length == 1 && toHide[0].parentElement != installed) {
+  if (toHide.length === 1 && toHide[0].parentElement !== installed) {
     installed.appendChild(toHide[0]);
   }
   return;
@@ -885,7 +885,7 @@ function reapplyFilter(container = installed) {
     const skipGroup = state => {
       const start = i;
       const first = entry;
-      while (entry && entry.classList.contains('hidden') == state) {
+      while (entry && entry.classList.contains('hidden') === state) {
         entry = entry.nextElementSibling;
         i++;
       }
@@ -978,19 +978,19 @@ function objectDiff(first, second, path = '') {
       diff.push({path, key, values: [a], type: 'removed'});
       continue;
     }
-    if (a && typeof a.filter == 'function' && b && typeof b.filter == 'function') {
+    if (a && typeof a.filter === 'function' && b && typeof b.filter === 'function') {
       if (
-        a.length != b.length ||
+        a.length !== b.length ||
         a.some((el, i) => {
-          const result = !el || typeof el != 'object'
-            ? el != b[i]
+          const result = !el || typeof el !== 'object'
+            ? el !== b[i]
             : objectDiff(el, b[i], path + key + '[' + i + '].').length;
           return result;
         })
       ) {
         diff.push({path, key, values: [a, b], type: 'changed'});
       }
-    } else if (typeof a == 'object' && typeof b == 'object') {
+    } else if (typeof a === 'object' && typeof b === 'object') {
       diff.push(...objectDiff(a, b, path + key + '.'));
     } else {
       diff.push({path, key, values: [a, b], type: 'changed'});
diff --git a/msgbox/msgbox.js b/msgbox/msgbox.js
index a7ebbe2a..8faf8d60 100644
--- a/msgbox/msgbox.js
+++ b/msgbox/msgbox.js
@@ -30,9 +30,9 @@ function messageBox({
       key(event) {
         const keyCode = event.keyCode || event.which;
         if (!event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey
-        && (keyCode == 13 || keyCode == 27)) {
+        && (keyCode === 13 || keyCode === 27)) {
           event.preventDefault();
-          resolveWith(keyCode == 13 ? {enter: true} : {esc: true});
+          resolveWith(keyCode === 13 ? {enter: true} : {esc: true});
         }
       },
       scroll() {
@@ -52,7 +52,7 @@ function messageBox({
       unbindAndRemoveSelf();
     }
     const id = 'message-box';
-    const putAs = typeof contents == 'string' ? 'innerHTML' : 'appendChild';
+    const putAs = typeof contents === 'string' ? 'innerHTML' : 'appendChild';
     messageBox.element = $element({id, className, appendChild: [
       $element({appendChild: [
         $element({id: `${id}-title`, innerHTML: title}),
diff --git a/options/index.js b/options/index.js
index 6404eefb..10404e5b 100644
--- a/options/index.js
+++ b/options/index.js
@@ -67,7 +67,7 @@ function setupRadioButtons() {
   const sets = {};
   const onChange = function () {
     const newValue = sets[this.name].indexOf(this);
-    if (newValue >= 0 && prefs.get(this.name) != newValue) {
+    if (newValue >= 0 && prefs.get(this.name) !== newValue) {
       prefs.set(this.name, newValue);
     }
   };
diff --git a/popup/popup.js b/popup/popup.js
index 42dd69e3..52accdf1 100644
--- a/popup/popup.js
+++ b/popup/popup.js
@@ -278,7 +278,7 @@ Object.assign(handleEvent, {
   toggle(event) {
     saveStyleSafe({
       id: handleEvent.getClickedStyleId(event),
-      enabled: this.type == 'checkbox' ? this.checked : this.matches('.enable'),
+      enabled: this.type === 'checkbox' ? this.checked : this.matches('.enable'),
     });
   },
 
@@ -293,9 +293,9 @@ Object.assign(handleEvent, {
     window.onkeydown = event => {
       const keyCode = event.keyCode || event.which;
       if (!event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey
-      && (keyCode == 13 || keyCode == 27)) {
+      && (keyCode === 13 || keyCode === 27)) {
         event.preventDefault();
-        confirm(keyCode == 13);
+        confirm(keyCode === 13);
       }
     };
     function confirm(ok) {
@@ -342,9 +342,9 @@ Object.assign(handleEvent, {
 
   maybeEdit(event) {
     if (!(
-      event.button == 0 && (event.ctrlKey || event.metaKey) ||
-      event.button == 1 ||
-      event.button == 2)) {
+      event.button === 0 && (event.ctrlKey || event.metaKey) ||
+      event.button === 1 ||
+      event.button === 2)) {
       return;
     }
     // open an editor on middleclick
@@ -401,10 +401,10 @@ function detectSloppyRegexps({entry, style}) {
   for (const section of style.sections) {
     for (const regexp of section.regexps) {
       for (let pass = 1; pass <= 2; pass++) {
-        const cacheKey = pass == 1 ? regexp : BG.SLOPPY_REGEXP_PREFIX + regexp;
+        const cacheKey = pass === 1 ? regexp : BG.SLOPPY_REGEXP_PREFIX + regexp;
         if (!rxCache.has(cacheKey)) {
           // according to CSS4 @document specification the entire URL must match
-          const anchored = pass == 1 ? '^(?:' + regexp + ')$' : '^' + regexp + '$';
+          const anchored = pass === 1 ? '^(?:' + regexp + ')$' : '^' + regexp + '$';
           const rx = tryRegExp(anchored);
           rxCache.set(cacheKey, rx || false);
         }

From 8cfb37351d94cbb39a43b2979d0b23324f665774 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sun, 16 Jul 2017 14:40:13 -0500
Subject: [PATCH 92/94] Remove unused variables

---
 background/background.js | 2 +-
 edit/edit.js             | 4 ++--
 manage/fileSaveLoad.js   | 6 +++---
 manage/manage.js         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/background/background.js b/background/background.js
index 3b4f1aa7..13d12e2f 100644
--- a/background/background.js
+++ b/background/background.js
@@ -26,7 +26,7 @@ chrome.webNavigation.onHistoryStateUpdated.addListener(data =>
 chrome.webNavigation.onReferenceFragmentUpdated.addListener(data =>
   webNavigationListener('styleReplaceAll', data));
 
-chrome.tabs.onAttached.addListener((tabId, data) => {
+chrome.tabs.onAttached.addListener(tabId => {
   // When an edit page gets attached or detached, remember its state
   // so we can do the same to the next one to open.
   chrome.tabs.get(tabId, tab => {
diff --git a/edit/edit.js b/edit/edit.js
index 8afb891e..d7edd6cc 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -831,8 +831,8 @@ function setupGlobalSearch() {
         return;
       }
       // hide the first two dialogs (replace, replaceWith)
-      cm.openDialog = (tmpl, callback, opt) => {
-        cm.openDialog = (tmpl, callback, opt) => {
+      cm.openDialog = (tmpl, callback) => {
+        cm.openDialog = (tmpl, callback) => {
           cm.openDialog = originalOpenDialog;
           if (all) {
             callback(replacement);
diff --git a/manage/fileSaveLoad.js b/manage/fileSaveLoad.js
index ec54517d..4a8397ec 100644
--- a/manage/fileSaveLoad.js
+++ b/manage/fileSaveLoad.js
@@ -195,7 +195,7 @@ function importFromString(jsonString) {
         contents: report.length ? report : t('importReportUnchanged'),
         buttons: [t('confirmOK'), numChanged && t('undo')],
         onshow:  bindClick,
-      }).then(({button, enter, esc}) => {
+      }).then(({button}) => {
         if (button === 1) {
           undo();
         }
@@ -241,7 +241,7 @@ function importFromString(jsonString) {
     }
   }
 
-  function bindClick(box) {
+  function bindClick() {
     const highlightElement = event => {
       const styleElement = $('#style-' + event.target.dataset.id);
       if (styleElement) {
@@ -367,7 +367,7 @@ Object.assign(document.body, {
       this.classList.remove('fadeout');
     }
   },
-  ondragend(event) {
+  ondragend() {
     animateElement(this, {className: 'fadeout', removeExtraClasses: ['dropzone']}).then(() => {
       this.style.animationDuration = '';
     });
diff --git a/manage/manage.js b/manage/manage.js
index 124c7d72..3d11308a 100644
--- a/manage/manage.js
+++ b/manage/manage.js
@@ -360,7 +360,7 @@ Object.assign(handleEvent, {
       className: 'danger center',
       buttons: [t('confirmDelete'), t('confirmCancel')],
     })
-    .then(({button, enter, esc}) => {
+    .then(({button, enter}) => {
       if (button === 0 || enter) {
         deleteStyleSafe({id});
       }

From a46684f8926f84e77fe183e1eb96a03987a57f7d Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sun, 16 Jul 2017 15:04:40 -0500
Subject: [PATCH 93/94] Style options cursor

---
 options/index.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/options/index.css b/options/index.css
index fbc0e803..1b9508f7 100644
--- a/options/index.css
+++ b/options/index.css
@@ -81,6 +81,7 @@ label:not([disabled]) > :first-child {
 
 label:not([disabled]):hover > :first-child {
   text-shadow: 0 0 0.01px rgba(0, 0, 0, .25);
+  cursor: pointer;
 }
 
 button,

From b50c19a802290e26d9813118e21b2e1c0e0f33a2 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 19 Jul 2017 15:09:29 +0300
Subject: [PATCH 94/94] editor import: warn about invalid -moz-document
 functions

* fixes #118
* alleviates #116 by switching showRegExpTester() from innerHTML to DOM
---
 edit/edit.js | 101 ++++++++++++++++++++++++++++++++++++++-------------
 js/dom.js    |  10 +++--
 2 files changed, 82 insertions(+), 29 deletions(-)

diff --git a/edit/edit.js b/edit/edit.js
index d7edd6cc..dbd873fd 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -1557,7 +1557,7 @@ function fromMozillaFormat() {
     const parser = new parserlib.css.Parser();
     const lines = mozStyle.split('\n');
     const sectionStack = [{code: '', start: {line: 1, col: 1}}];
-    let errors = '';
+    const errors = [];
     // let oldSectionCount = editors.length;
     let firstAddedCM;
 
@@ -1575,12 +1575,16 @@ function fromMozillaFormat() {
         doAddSection(sectionStack.last);
         sectionStack.last.code = '';
       }
-      e.functions.forEach(f => {
-        const m = f.match(/^(url|url-prefix|domain|regexp)\((['"]?)(.+?)\2?\)$/);
+      for (const f of e.functions) {
+        const m = f && f.match(/^([\w-]*)\((['"]?)(.+?)\2?\)$/);
+        if (!m || !/^(url|url-prefix|domain|regexp)$/.test(m[1])) {
+          errors.push(`${e.line}:${e.col + 1} invalid function "${m ? m[1] : f || ''}"`);
+          continue;
+        }
         const aType = CssToProperty[m[1]];
         const aValue = aType !== 'regexps' ? m[3] : m[3].replace(/\\\\/g, '\\');
         (section[aType] = section[aType] || []).push(aValue);
-      });
+      }
       sectionStack.push(section);
     });
 
@@ -1607,12 +1611,16 @@ function fromMozillaFormat() {
       firstAddedCM.focus();
 
       if (errors) {
-        showHelp(t('issues'), errors);
+        showHelp(t('issues'), $element({
+          tag: 'pre',
+          textContent: errors.join('\n'),
+        }));
       }
     });
 
     parser.addListener('error', e => {
-      errors += e.line + ':' + e.col + ' ' + e.message.replace(/ at line \d.+$/, '') + '<br>';
+      errors.push(e.line + ':' + e.col + ' ' +
+        e.message.replace(/ at line \d.+$/, ''));
     });
 
     parser.parse(mozStyle);
@@ -1834,13 +1842,16 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
         rxData.urls = urlsNow;
       }
     }
-    const moreInfoLink = template.regexpTestPartial.outerHTML;
     const stats = {
       full: {data: [], label: t('styleRegexpTestFull')},
-      partial: {data: [], label: t('styleRegexpTestPartial') + moreInfoLink},
+      partial: {data: [], label: [
+        t('styleRegexpTestPartial'),
+        template.regexpTestPartial.cloneNode(true),
+      ]},
       none: {data: [], label: t('styleRegexpTestNone')},
       invalid: {data: [], label: t('styleRegexpTestInvalid')},
     };
+    // collect stats
     for (const {text, rx, urls} of regexps) {
       if (!rx) {
         stats.invalid.data.push({text});
@@ -1856,12 +1867,18 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
         const faviconUrl = url.startsWith(URLS.ownOrigin)
           ? OWN_ICON
           : GET_FAVICON_URL + new URL(url).hostname;
-        const icon = `<img src="${faviconUrl}">`;
+        const icon = $element({tag: 'img', src: faviconUrl});
         if (match.length === url.length) {
-          full.push(`<div>${icon + url}</div>`);
+          full.push($element({appendChild: [
+            icon,
+            url,
+          ]}));
         } else {
-          partial.push(`<div>${icon}<mark>${match}</mark>` +
-            url.substr(match.length) + '</div>');
+          partial.push($element({appendChild: [
+            icon,
+            $element({tag: 'mark', textContent: match}),
+            url.substr(match.length),
+          ]}));
         }
       }
       if (full.length) {
@@ -1871,17 +1888,42 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
         stats.partial.data.push({text, urls: partial});
       }
     }
-    showHelp(t('styleRegexpTestTitle'),
-      '<div class="regexp-report">' +
-      Object.keys(stats).map(type => (!stats[type].data.length ? '' :
-        `<details open data-type="${type}">
-          <summary>${stats[type].label}</summary>` +
-          stats[type].data.map(({text, urls}) => (!urls ? text :
-            `<details open><summary>${text}</summary>${urls.join('')}</details>`
-          )).join('<br>') +
-        '</details>'
-      )).join('') +
-      '</div>');
+    // render stats
+    const report = $element({className: 'regexp-report'});
+    const br = $element({tag: 'br'});
+    for (const type in stats) {
+      // top level groups: full, partial, none, invalid
+      const {label, data} = stats[type];
+      if (!data.length) {
+        continue;
+      }
+      // 2nd level: regexp text
+      const summary = $element({tag: 'summary', appendChild: label});
+      const block = [summary];
+      for (const {text, urls} of data) {
+        if (!urls) {
+          block.push(text, br.cloneNode());
+          continue;
+        }
+        block.push($element({
+          tag: 'details',
+          open: true,
+          appendChild: [
+            $element({tag: 'summary', textContent: text}),
+            // 3rd level: tab urls
+            ...urls,
+          ],
+        }));
+      }
+      report.appendChild($element({
+        tag: 'details',
+        open: true,
+        dataset: {type},
+        appendChild: block,
+      }));
+    }
+    showHelp(t('styleRegexpTestTitle'), report);
+
     document.querySelector('.regexp-report').onclick = event => {
       const target = event.target.closest('a, .regexp-report div');
       if (target) {
@@ -1893,10 +1935,17 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
 }
 
 function showHelp(title, text) {
-  const div = document.getElementById('help-popup');
+  const div = $('#help-popup');
   div.classList.remove('big');
-  div.querySelector('.contents').innerHTML = text;
-  div.querySelector('.title').innerHTML = title;
+
+  const contents = $('.contents', div);
+  if (text instanceof HTMLElement) {
+    contents.textContent = '';
+    contents.appendChild(text);
+  } else {
+    contents.innerHTML = text;
+  }
+  $('.title', div).textContent = title;
 
   if (getComputedStyle(div).display === 'none') {
     document.addEventListener('keydown', closeHelp);
diff --git a/js/dom.js b/js/dom.js
index 6a71a10a..ced73414 100644
--- a/js/dom.js
+++ b/js/dom.js
@@ -106,7 +106,7 @@ function $$(selector, base = document) {
 
 function $element(opt) {
   // tag:              string, default 'div', may include namespace like 'ns#tag'
-  // appendChild:      element or an array of elements
+  // appendChild:      element/string or an array of elements/strings
   // dataset:          object
   // any DOM property: assigned as is
   const [ns, tag] = opt.tag && opt.tag.includes('#')
@@ -115,8 +115,12 @@ function $element(opt) {
   const element = ns
     ? document.createElementNS(ns === 'SVG' || ns === 'svg' ? 'http://www.w3.org/2000/svg' : ns, tag)
     : document.createElement(tag || 'div');
-  (opt.appendChild instanceof Array ? opt.appendChild : [opt.appendChild])
-    .forEach(child => child && element.appendChild(child));
+  const children = opt.appendChild instanceof Array ? opt.appendChild : [opt.appendChild];
+  for (const child of children) {
+    if (child) {
+      element.appendChild(child instanceof Node ? child : document.createTextNode(child));
+    }
+  }
   delete opt.appendChild;
   delete opt.tag;
   if (opt.dataset) {