Merge "Fix sessionfailure i18n message during authentication"

[lhc/web/wiklou.git] / languages / i18n / en.json

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 365e036..7316448 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -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": "",
@@ -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.",
@@ -1916,7 +1917,7 @@
        "doubleredirects-summary": "",
        "doubleredirectstext": "This page lists pages that redirect to other redirect pages.\nEach row contains links to the first and second redirect, as well as the target of the second redirect, which is usually the \"real\" target page to which the first redirect should point.\n<del>Crossed out</del> entries have been solved.",
        "double-redirect-fixed-move": "[[$1]] has been moved.\nIt was automatically updated and now it redirects to [[$2]].",
-       "double-redirect-fixed-maintenance": "Automatically fixing double redirect from [[$1]] to [[$2]] in a maintenance job.",
+       "double-redirect-fixed-maintenance": "Automatically fixing double redirect from [[$1]] to [[$2]] in a maintenance job",
        "double-redirect-fixer": "Redirect fixer",
        "brokenredirects": "Broken redirects",
        "brokenredirects-summary": "",
@@ -4425,6 +4426,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.",