Merge "Rephrase watchlistedit-clear-title"

diff --combined languages/i18n/en.json
index 4bbfa22,db03fd7..f2cdbe2
--- 1/languages/i18n/en.json
--- 2/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -18,7 -18,6 +18,7 @@@
        "tog-watchdefault": "Add pages and files I edit to my watchlist",
        "tog-watchmoves": "Add pages and files I move to my watchlist",
        "tog-watchdeletion": "Add pages and files I delete to my watchlist",
 +      "tog-watchuploads": "Add new files I upload to my watchlist",
        "tog-watchrollback": "Add pages where I have performed a rollback to my watchlist",
        "tog-minordefault": "Mark all edits minor by default",
        "tog-previewontop": "Show preview before edit box",
@@@ -1378,9 -1377,9 +1378,9 @@@
        "recentchangeslinked-page": "Page name:",
        "recentchangeslinked-to": "Show changes to pages linked to the given page instead",
        "recentchanges-page-added-to-category": "[[:$1]] added to category",
 -      "recentchanges-page-added-to-category-bundled": "[[:$1]] and [[Special:WhatLinksHere/$1|{{PLURAL:$2|one page|$2 pages}}]] added to category",
 +      "recentchanges-page-added-to-category-bundled": "[[:$1]] added to category, [[Special:WhatLinksHere/$1|this page is included within other pages]]",
        "recentchanges-page-removed-from-category": "[[:$1]] removed from category",
 -      "recentchanges-page-removed-from-category-bundled": "[[:$1]] and [[Special:WhatLinksHere/$1|{{PLURAL:$2|one page|$2 pages}}]] removed from category",
 +      "recentchanges-page-removed-from-category-bundled": "[[:$1]] removed from category, [[Special:WhatLinksHere/$1|this page is included within other pages]]",
        "autochange-username": "MediaWiki automatic change",
        "upload": "Upload file",
        "uploadbtn": "Upload file",
@@@ -1933,6 -1932,8 +1933,6 @@@
        "categories-submit": "Show",
        "categoriespagetext": "The following {{PLURAL:$1|category contains|categories contain}} pages or media.\n[[Special:UnusedCategories|Unused categories]] are not shown here.\nAlso see [[Special:WantedCategories|wanted categories]].",
        "categoriesfrom": "Display categories starting at:",
 -      "special-categories-sort-count": "sort by count",
 -      "special-categories-sort-abc": "sort alphabetically",
        "deletedcontributions": "Deleted user contributions",
        "deletedcontributions-summary": "",
        "deletedcontributions-title": "Deleted user contributions",
@@@ -2972,8 -2973,8 +2972,8 @@@
        "exif-colorspace": "Color space",
        "exif-componentsconfiguration": "Meaning of each component",
        "exif-compressedbitsperpixel": "Image compression mode",
 -      "exif-pixelydimension": "Image width",
 -      "exif-pixelxdimension": "Image height",
 +      "exif-pixelxdimension": "Image width",
 +      "exif-pixelydimension": "Image height",
        "exif-usercomment": "User comments",
        "exif-relatedsoundfile": "Related audio file",
        "exif-datetimeoriginal": "Date and time of data generation",
@@@ -3339,10 -3340,6 +3339,10 @@@
        "confirmemail_body_set": "Someone, probably you, from IP address $1,\nhas set the email address of the account \"$2\" to this address on {{SITENAME}}.\n\nTo confirm that this account really does belong to you and activate\nemail features on {{SITENAME}}, open this link in your browser:\n\n$3\n\nIf the account does *not* belong to you, follow this link\nto cancel the email address confirmation:\n\n$5\n\nThis confirmation code will expire at $4.",
        "confirmemail_invalidated": "Email address confirmation canceled",
        "invalidateemail": "Cancel email confirmation",
 +      "notificationemail_subject_changed": "{{SITENAME}} registered email address has been changed",
 +      "notificationemail_subject_removed": "{{SITENAME}} registered email address has been removed",
 +      "notificationemail_body_changed": "Someone, probably you, from IP address $1,\nhas changed the email address of the account \"$2\" to \"$3\" on {{SITENAME}}.\n\nIf this was not you, contact a site administrator immediately.",
 +      "notificationemail_body_removed": "Someone, probably you, from IP address $1,\nhas removed the email address of the account \"$2\" on {{SITENAME}}.\n\nIf this was not you, contact a site administrator immediately.",
        "scarytranscludedisabled": "[Interwiki transcluding is disabled]",
        "scarytranscludefailed": "[Template fetch failed for $1]",
        "scarytranscludefailed-httpstatus": "[Template fetch failed for $1: HTTP $2]",
@@@ -3437,7 -3434,7 +3437,7 @@@
        "watchlistedit-raw-done": "Your watchlist has been updated.",
        "watchlistedit-raw-added": "{{PLURAL:$1|1 title was|$1 titles were}} added:",
        "watchlistedit-raw-removed": "{{PLURAL:$1|1 title was|$1 titles were}} removed:",
-       "watchlistedit-clear-title": "Cleared watchlist",
+       "watchlistedit-clear-title": "Clear watchlist",
        "watchlistedit-clear-legend": "Clear watchlist",
        "watchlistedit-clear-explain": "All of the titles will be removed from your watchlist",
        "watchlistedit-clear-titles": "Titles:",