X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=languages%2Fi18n%2Fen.json;h=3dc01d9a2957529eb959e2e0de253dc98959dd8b;hb=6d4e15476c6ec12ecc671c1d3536eacede7211b2;hp=4cabfdab4cf422e7e0030e3de0e953504f4513bb;hpb=b324fa5b8be3389cc311a7b62987cc8c92793f08;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 4cabfdab4c..3dc01d9a29 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -684,7 +684,7 @@
 	"userjspreview": "<strong>Remember that you are only testing/previewing your user JavaScript.\nIt has not yet been saved!</strong>",
 	"sitecsspreview": "<strong>Remember that you are only previewing this CSS.\nIt has not yet been saved!</strong>",
 	"sitejspreview": "<strong>Remember that you are only previewing this JavaScript code.\nIt has not yet been saved!</strong>",
-	"userinvalidcssjstitle": "<strong>Warning:</strong> There is no skin \"$1\".\nCustom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/vector.css as opposed to {{ns:user}}:Foo/Vector.css.",
+	"userinvalidconfigtitle": "<strong>Warning:</strong> There is no skin \"$1\".\nCustom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/vector.css as opposed to {{ns:user}}:Foo/Vector.css.",
 	"updated": "(Updated)",
 	"note": "<strong>Note:</strong>",
 	"previewnote": "<strong>Remember that this is only a preview.</strong>\nYour changes have not yet been saved!",
@@ -745,6 +745,7 @@
 	"postedit-confirmation-created": "The page has been created.",
 	"postedit-confirmation-restored": "The page has been restored.",
 	"postedit-confirmation-saved": "Your edit was saved.",
+	"postedit-confirmation-published": "Your edit was published.",
 	"edit-already-exists": "Could not create a new page.\nIt already exists.",
 	"addsection-preload": "",
 	"addsection-editintro": "",
@@ -1072,7 +1073,7 @@
 	"prefs-files": "Files",
 	"prefs-custom-css": "Custom CSS",
 	"prefs-custom-js": "Custom JavaScript",
-	"prefs-common-css-js": "Shared CSS/JavaScript for all skins:",
+	"prefs-common-config": "Shared CSS/JavaScript for all skins:",
 	"prefs-reset-intro": "You can use this page to reset your preferences to the site defaults.\nThis cannot be undone.",
 	"prefs-emailconfirm-label": "Email confirmation:",
 	"youremail": "Email:",
@@ -1713,7 +1714,7 @@
 	"lockmanager-fail-closelock": "Could not close lock file for \"$1\".",
 	"lockmanager-fail-deletelock": "Could not delete lock file for \"$1\".",
 	"lockmanager-fail-acquirelock": "Could not acquire lock for \"$1\".",
-	"lockmanager-fail-openlock": "Could not open lock file for \"$1\".",
+	"lockmanager-fail-openlock": "Could not open lock file for \"$1\". Make sure your upload directory is configured correctly and your web server has permission to write to that directory. See https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgUploadDirectory for more information.",
 	"lockmanager-fail-releaselock": "Could not release lock for \"$1\".",
 	"lockmanager-fail-db-bucket": "Could not contact enough lock databases in bucket $1.",
 	"lockmanager-fail-db-release": "Could not release locks on database $1.",
@@ -2339,7 +2340,7 @@
 	"rollback-success": "Reverted edits by {{GENDER:$3|$1}};\nchanged back to last revision by {{GENDER:$4|$2}}.",
 	"rollback-success-notify": "Reverted edits by $1;\nchanged back to last revision by $2. [$3 Show changes]",
 	"sessionfailure-title": "Session failure",
-	"sessionfailure": "There seems to be a problem with your login session;\nthis action has been canceled as a precaution against session hijacking.\nGo back to the previous page, reload that page and then try again.",
+	"sessionfailure": "There seems to be a problem with your login session;\nthis action has been canceled as a precaution against session hijacking.\nPlease resubmit the form.",
 	"changecontentmodel" : "Change content model of a page",
 	"changecontentmodel-legend": "Change content model",
 	"changecontentmodel-title-label": "Page title",
@@ -3706,6 +3707,7 @@
 	"watchlistedit-clear-titles": "Titles:",
 	"watchlistedit-clear-submit": "Clear the watchlist (This is permanent!)",
 	"watchlistedit-clear-done": "Your watchlist has been cleared.",
+	"watchlistedit-clear-jobqueue": "Your watchlist is being cleared. This may take some time!",
 	"watchlistedit-clear-removed": "{{PLURAL:$1|1 title was|$1 titles were}} removed:",
 	"watchlistedit-too-many": "There are too many pages to display here.",
 	"watchlisttools-clear": "Clear the watchlist",
@@ -4425,6 +4427,8 @@
 	"restrictionsfield-badip": "Invalid IP address or range: $1",
 	"restrictionsfield-label": "Allowed IP ranges:",
 	"restrictionsfield-help": "One IP address or CIDR range per line. To enable everything, use:<pre>0.0.0.0/0\n::/0</pre>",
+	"edit-error-short": "Error: $1",
+	"edit-error-long": "Errors:\n\n$1",
 	"revid": "revision $1",
 	"pageid": "page ID $1",
 	"rawhtml-notallowed": "&lt;html&gt; tags cannot be used outside of normal pages.",