Merge "Block: $row is a stdClass, not a ResultWrapper"

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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 962f6d4..bc2dbdb 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -384,7 +384,7 @@
        "externaldberror": "There was either an authentication database error or you are not allowed to update your external account.",
        "login": "Log in",
        "nav-login-createaccount": "Log in / create account",
-       "loginprompt": "You must have cookies enabled to log in to {{SITENAME}}.",
+       "loginprompt": "",
        "userlogin": "Log in / create account",
        "userloginnocreate": "Log in",
        "logout": "Log out",
@@ -777,7 +777,7 @@
        "revdelete-text-text": "Deleted revisions will still appear in the page history, but parts of their content will be inaccessible to the public.",
        "revdelete-text-file": "Deleted file versions will still appear in the file history, but parts of their content will be inaccessible to the public.",
        "logdelete-text": "Deleted log events will still appear in the logs, but parts of their content will be inaccessible to the public.",
-       "revdelete-text-others": "Other administrators on {{SITENAME}} will still be able to access the hidden content and can undelete it again through this same interface, unless additional restrictions are set.",
+       "revdelete-text-others": "Other administrators will still be able to access the hidden content and to undelete it, unless additional restrictions are set.",
        "revdelete-confirm": "Please confirm that you intend to do this, that you understand the consequences, and that you are doing this in accordance with [[{{MediaWiki:Policy-url}}|the policy]].",
        "revdelete-suppress-text": "Suppression should <strong>only</strong> be used for the following cases:\n* potentially libelous information\n* inappropriate personal information\n*: <em>home addresses and telephone numbers, national identification numbers, etc.</em>",
        "revdelete-legend": "Set visibility restrictions",
@@ -1413,6 +1413,7 @@
        "license-header": "Licensing",
        "nolicense": "None selected",
        "licenses": "-",
+       "licenses-edit": "Edit license options",
        "license-nopreview": "(Preview not available)",
        "upload_source_url": "(a valid, publicly accessible URL)",
        "upload_source_file": "(a file on your computer)",
@@ -3215,6 +3216,7 @@
        "timezone-utc": "UTC",
        "unknown_extension_tag": "Unknown extension tag \"$1\"",
        "duplicate-defaultsort": "<strong>Warning:</strong> Default sort key \"$2\" overrides earlier default sort key \"$1\".",
+       "duplicate-displaytitle": "<strong>Warning:</strong> Display title \"$2\" overrides earlier display title \"$1\".",
        "version": "Version",
        "version-summary": "",
        "version-extensions": "Installed extensions",