Merge branch 'mw-1.26'

1 files changed, 14 insertions, 8 deletions

diff --git a/extensions/SyntaxHighlight_GeSHi/i18n/en.json b/extensions/SyntaxHighlight_GeSHi/i18n/en.json
index 4d1f4fc2..170cb6c0 100644
--- a/extensions/SyntaxHighlight_GeSHi/i18n/en.json
+++ b/extensions/SyntaxHighlight_GeSHi/i18n/en.json
@@ -1,13 +1,19 @@
 {
     "@metadata": {
         "authors": [
-            "Brion Vibber"
+            "Brion Vibber",
+            "Ed Sanders"
         ]
     },
-    "syntaxhighlight-desc": "Provides syntax highlighting <code>&lt;syntaxhighlight&gt;</code> using [http://qbnz.com/highlighter/ GeSHi - Generic Syntax Highlighter]",
-    "syntaxhighlight-specify": "You need to specify a language like this:",
-    "syntaxhighlight-supported": "Supported languages for syntax highlighting:",
-    "syntaxhighlight-err-loading": "(error loading supported language list)",
-    "syntaxhighlight-err-language": "Invalid language.",
-    "geshi.css": "/* CSS placed here will be applied to GeSHi syntax highlighting */"
-}
\ No newline at end of file
+    "syntaxhighlight-desc": "Provides syntax highlighting <code>&lt;syntaxhighlight&gt;</code> using [http://pygments.org/ Pygments - Python syntax highlighter]",
+    "syntaxhighlight-error-category": "Pages with syntax highlighting errors",
+    "syntaxhighlight-error-category-desc": "There was an error when attempting to highlight code included on the page.",
+    "syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-code": "Code",
+    "syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-language": "Language",
+    "syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-none": "(None)",
+    "syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-showlines": "Show line numbers",
+    "syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-title": "Code block",
+    "syntaxhighlight-error-pygments-invocation-failure": "Failed to invoke Pygments",
+    "syntaxhighlight-error-unknown-language": "Unknown language \"$1\"",
+    "syntaxhighlight-error-exceeds-size-limit": "Code size of $1 {{PLURAL:$1|bytes}} exceeds allowed maximum of $2 {{PLURAL:$2|bytes}}"
+}