Merge "Revert "If rev_content_model is null, use page_content_model.""

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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0d7d047..982371b 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -658,7 +658,9 @@
        "minoredit": "This is a minor edit",
        "watchthis": "Watch this page",
        "savearticle": "Save page",
+       "savechanges": "Save changes",
        "publishpage": "Publish page",
+       "publishchanges": "Publish changes",
        "preview": "Preview",
        "showpreview": "Show preview",
        "showdiff": "Show changes",
@@ -1281,8 +1283,8 @@
        "rightslogtext": "This is a log of changes to user rights.",
        "action-read": "read this page",
        "action-edit": "edit this page",
-       "action-createpage": "create pages",
-       "action-createtalk": "create discussion pages",
+       "action-createpage": "create this page",
+       "action-createtalk": "create this discussion page",
        "action-createaccount": "create this user account",
        "action-autocreateaccount": "automatically create this external user account",
        "action-history": "view the history of this page",
@@ -1513,7 +1515,7 @@
        "upload-http-error": "An HTTP error occurred: $1",
        "upload-copy-upload-invalid-domain": "Copy uploads are not available from this domain.",
        "upload-foreign-cant-upload": "This wiki is not configured to upload files to the requested foreign file repository.",
-       "upload-foreign-cant-load-config": "Loading file upload configuration for the foreign file repository failed.",
+       "upload-foreign-cant-load-config": "Failed to load the configuration for file uploads to the foreign file repository.",
        "upload-dialog-disabled": "File uploads using this dialog are disabled on this wiki.",
        "upload-dialog-title": "Upload file",
        "upload-dialog-button-cancel": "Cancel",
@@ -4072,8 +4074,8 @@
        "log-action-filter-newusers": "Type of account creation:",
        "log-action-filter-patrol": "Type of patrol:",
        "log-action-filter-protect": "Type of protection:",
-       "log-action-filter-rights": "Type of right change",
-       "log-action-filter-suppress": "Type of suppression",
+       "log-action-filter-rights": "Type of right change:",
+       "log-action-filter-suppress": "Type of suppression:",
        "log-action-filter-upload": "Type of upload:",
        "log-action-filter-all": "All",
        "log-action-filter-block-block": "Block",
@@ -4108,7 +4110,7 @@
        "log-action-filter-suppress-event": "Log suppression",
        "log-action-filter-suppress-revision": "Revision suppression",
        "log-action-filter-suppress-delete": "Page suppression",
-       "log-action-filter-suppress-block": "User supppression by block",
+       "log-action-filter-suppress-block": "User suppression by block",
        "log-action-filter-suppress-reblock": "User suppression by reblock",
        "log-action-filter-upload-upload": "New upload",
        "log-action-filter-upload-overwrite": "Reupload",