Merge "Changed "archived (revisions)" to "deleted (revisions)""

diff --combined languages/i18n/en.json
index aa71f3b,e05f85e..67a62c9
--- 1/languages/i18n/en.json
--- 2/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -1268,8 -1268,8 +1268,8 @@@
        "unpatrolledletter": "!",
        "number_of_watching_users_RCview": "[$1]",
        "number_of_watching_users_pageview": "[$1 watching {{PLURAL:$1|user|users}}]",
 -      "rc_categories": "Limit to categories (separate with \"|\")",
 -      "rc_categories_any": "Any",
 +      "rc_categories": "Limit to categories (separate with \"|\"):",
 +      "rc_categories_any": "Any of the chosen",
        "rc-change-size": "$1",
        "rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} after change",
        "newsectionsummary": "/* $1 */ new section",
@@@ -1398,19 -1398,6 +1398,19 @@@
        "upload-too-many-redirects": "The URL contained too many redirects",
        "upload-http-error": "An HTTP error occurred: $1",
        "upload-copy-upload-invalid-domain": "Copy uploads are not available from this domain.",
 +      "upload-dialog-title": "Upload file",
 +      "upload-dialog-error": "An error occurred",
 +      "upload-dialog-warning": "A warning occurred",
 +      "upload-dialog-button-cancel": "Cancel",
 +      "upload-dialog-button-done": "Done",
 +      "upload-dialog-button-save": "Save",
 +      "upload-dialog-button-upload": "Upload",
 +      "upload-dialog-label-select-file": "Select file",
 +      "upload-dialog-label-infoform-title": "Details",
 +      "upload-dialog-label-infoform-name": "Name",
 +      "upload-dialog-label-infoform-description": "Description",
 +      "upload-dialog-label-usage-title": "Usage",
 +      "upload-dialog-label-usage-filename": "File name",
        "backend-fail-stream": "Could not stream file \"$1\".",
        "backend-fail-backup": "Could not backup file \"$1\".",
        "backend-fail-notexists": "The file $1 does not exist.",
@@@ -2035,7 -2022,7 +2035,7 @@@
        "undeletepagetext": "The following {{PLURAL:$1|page has been deleted but is|$1 pages have been deleted but are}} still in the archive and can be restored.\nThe archive may be periodically cleaned out.",
        "undelete-fieldset-title": "Restore revisions",
        "undeleteextrahelp": "To restore the page's entire history, leave all checkboxes deselected and click <strong><em>{{int:undeletebtn}}</em></strong>.\nTo perform a selective restoration, check the boxes corresponding to the revisions to be restored, and click <strong><em>{{int:undeletebtn}}</em></strong>.",
-       "undeleterevisions": "$1 {{PLURAL:$1|revision|revisions}} archived",
+       "undeleterevisions": "$1 {{PLURAL:$1|revision|revisions}} deleted",
        "undeletehistory": "If you restore the page, all revisions will be restored to the history.\nIf a new page with the same name has been created since the deletion, the restored revisions will appear in the prior history.",
        "undeleterevdel": "Undeletion will not be performed if it will result in the top page or file revision being partially deleted.\nIn such cases, you must uncheck or unhide the newest deleted revision.",
        "undeletehistorynoadmin": "This page has been deleted.\nThe reason for deletion is shown in the summary below, along with details of the users who had edited this page before deletion.\nThe actual text of these deleted revisions is only available to administrators.",
@@@ -2510,7 -2497,7 +2510,7 @@@
        "tooltip-ca-watch": "Add this page to your watchlist",
        "tooltip-ca-unwatch": "Remove this page from your watchlist",
        "tooltip-search": "Search {{SITENAME}}",
 -      "tooltip-search-go": "Go to a page with this exact name if exists",
 +      "tooltip-search-go": "Go to a page with this exact name if it exists",
        "tooltip-search-fulltext": "Search the pages for this text",
        "tooltip-p-logo": "Visit the main page",
        "tooltip-n-mainpage": "Visit the main page",
@@@ -2543,7 -2530,7 +2543,7 @@@
        "tooltip-ca-nstab-category": "View the category page",
        "tooltip-minoredit": "Mark this as a minor edit",
        "tooltip-save": "Save your changes",
 -      "tooltip-preview": "Preview your changes, please use this before saving!",
 +      "tooltip-preview": "Preview your changes. Please use this before saving.",
        "tooltip-diff": "Show which changes you made to the text",
        "tooltip-compareselectedversions": "See the differences between the two selected revisions of this page",
        "tooltip-watch": "Add this page to your watchlist",
@@@ -2590,7 -2577,7 +2590,7 @@@
        "spam_reverting": "Reverting to last revision not containing links to $1",
        "spam_blanking": "All revisions contained links to $1, blanking",
        "spam_deleting": "All revisions contained links to $1, deleting",
 -      "simpleantispam-label": "Anti-spam check.\nDo <strong>NOT</strong> fill this in!",
 +      "simpleantispam-label": "Anti-spam check.\nDo <strong>not</strong> fill this in!",
        "pageinfo-header": "-",
        "pageinfo-title": "Information for \"$1\"",
        "pageinfo-not-current": "Sorry, it's impossible to provide this information for old revisions.",
@@@ -3819,8 -3806,6 +3819,8 @@@
        "special-characters-title-emdash": "em dash",
        "special-characters-title-minus": "minus sign",
        "mw-widgets-dateinput-no-date": "No date selected",
 +      "mw-widgets-dateinput-placeholder-day": "YYYY-MM-DD",
 +      "mw-widgets-dateinput-placeholder-month": "YYYY-MM",
        "mw-widgets-titleinput-description-new-page": "page does not exist yet",
        "mw-widgets-titleinput-description-redirect": "redirect to $1"
  }