Merge "Consistency tweaks: xml -> XML, Href -> href"

diff --combined languages/i18n/en.json
index d632b9f,b8284ad..cd40649
--- 1/languages/i18n/en.json
--- 2/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -716,7 -716,6 +716,7 @@@
        "content-model-json": "JSON",
        "content-json-empty-object": "Empty object",
        "content-json-empty-array": "Empty array",
 +      "duplicate-args-warning": "<strong>Warning:</strong> [[:$1]] is calling [[:$2]] with more than one value for the \"$3\" parameter. Only the last value provided will be used.",
        "duplicate-args-category": "Pages using duplicate arguments in template calls",
        "duplicate-args-category-desc": "The page contains template calls that use duplicates of arguments, such as <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> or <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
        "expensive-parserfunction-warning": "<strong>Warning:</strong> This page contains too many expensive parser function calls.\n\nIt should have less than $2 {{PLURAL:$2|call|calls}}, there {{PLURAL:$1|is now $1 call|are now $1 calls}}.",
@@@ -1355,11 -1354,11 +1355,11 @@@
        "uploaddisabledtext": "File uploads are disabled.",
        "php-uploaddisabledtext": "File uploads are disabled in PHP.\nPlease check the file_uploads setting.",
        "uploadscripted": "This file contains HTML or script code that may be erroneously interpreted by a web browser.",
-       "upload-scripted-pi-callback": "Cannot upload a file that contains xml-stylesheet processing instruction.",
+       "upload-scripted-pi-callback": "Cannot upload a file that contains XML-stylesheet processing instruction.",
        "uploaded-script-svg": "Found scriptable element \"$1\" in the uploaded SVG file.",
        "uploaded-hostile-svg": "Found unsafe CSS in the style element of uploaded SVG file.",
        "uploaded-event-handler-on-svg": "Setting event-handler attributes <code>$1=\"$2\"</code> is not allowed in SVG files.",
-       "uploaded-href-attribute-svg": "Href attributes <code>&lt;$1 $2=\"$3\"&gt;</code> with non-local target (e.g. http://, javascript:, etc) are not allowed in SVG files.",
+       "uploaded-href-attribute-svg": "href attributes <code>&lt;$1 $2=\"$3\"&gt;</code> with non-local target (e.g. http://, javascript:, etc) are not allowed in SVG files.",
        "uploaded-href-unsafe-target-svg": "Found href to unsafe target <code>&lt;$1 $2=\"$3\"&gt;</code> in the uploaded SVG file.",
        "uploaded-animate-svg": "Found \"animate\" tag that might be changing href, using the \"from\" attribute <code>&lt;$1 $2=\"$3\"&gt;</code> in the uploaded SVG file.",
        "uploaded-setting-event-handler-svg": "Setting event-handler attributes is blocked, found <code>&lt;$1 $2=\"$3\"&gt;</code> in the uploaded SVG file.",
@@@ -3218,13 -3217,13 +3218,13 @@@
        "watchlistedit-normal-submit": "Remove titles",
        "watchlistedit-normal-done": "{{PLURAL:$1|1 title was|$1 titles were}} removed from your watchlist:",
        "watchlistedit-raw-title": "Edit raw watchlist",
 -        "watchlistedit-raw-legend": "Edit raw watchlist",
 +      "watchlistedit-raw-legend": "Edit raw watchlist",
        "watchlistedit-raw-explain": "Titles on your watchlist are shown below, and can be edited by adding to and removing from the list;\none title per line.\nWhen finished, click \"{{int:Watchlistedit-raw-submit}}\".\nYou can also [[Special:EditWatchlist|use the standard editor]].",
 -        "watchlistedit-raw-titles": "Titles:",
 -        "watchlistedit-raw-submit": "Update watchlist",
 -        "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-raw-titles": "Titles:",
 +      "watchlistedit-raw-submit": "Update watchlist",
 +      "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-legend": "Clear watchlist",
        "watchlistedit-clear-explain": "All of the titles will be removed from your watchlist",