diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b594d71f..580ef244 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -100,6 +100,18 @@
"message": "Theme",
"description": "Label for the style editor's CSS theme."
},
+ "confirmNo": {
+ "message": "No",
+ "description": "'No' button in a confirm dialog"
+ },
+ "confirmStop": {
+ "message": "Stop",
+ "description": "'Stop' button in a confirm dialog"
+ },
+ "confirmYes": {
+ "message": "Yes",
+ "description": "'Yes' button in a confirm dialog"
+ },
"dbError": {
"message": "An error has occurred using the Stylish database. Would you like to visit a web page with possible solutions?",
"description": "Prompt when a DB error is encountered"
@@ -229,6 +241,18 @@
"message": "Show number of styles active for the current site on the toolbar button",
"description": "Label for the checkbox controlling toolbar badge text."
},
+ "replace": {
+ "message": "Replace",
+ "description": "Label before the replace input field in the editor shown on Ctrl-H"
+ },
+ "replaceAll": {
+ "message": "Replace all",
+ "description": "Label before the replace input field in the editor shown on 'replaceAll' hotkey"
+ },
+ "replaceWith": {
+ "message": "Replace with",
+ "description": "Label before the replace-with input field in the editor shown on Ctrl-H etc."
+ },
"search": {
"message": "Search",
"description": "Label before the search input field in the editor shown on Ctrl-F"
diff --git a/edit.html b/edit.html
index 680fb56e..18d67a66 100644
--- a/edit.html
+++ b/edit.html
@@ -160,6 +160,15 @@
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;
+ }
@-webkit-keyframes highlight {
from {
background-color: #ff9;
diff --git a/edit.js b/edit.js
index d1cf8b61..7ad00314 100644
--- a/edit.js
+++ b/edit.js
@@ -10,8 +10,8 @@ var useHistoryBack; // use browser history back when "back to manage" is click
var propertyToCss = {urls: "url", urlPrefixes: "url-prefix", domains: "domain", regexps: "regexp"};
var CssToProperty = {"url": "urls", "url-prefix": "urlPrefixes", "domain": "domains", "regexp": "regexps"};
-// templates
-var appliesToTemplate = tHTML('\
+var template = {
+appliesTo: '\