Merge "Resources: Enable es5-shim and json for mobile as well as desktop target"

diff --git a/skins/Vector/Vector.php b/skins/Vector/Vector.php
index fae4663..be8719a 100644 (file)
--- a/skins/Vector/Vector.php
+++ b/skins/Vector/Vector.php
@@ -26,7 +26,7 @@ $wgExtensionCredits['skin'][] = array(
        'path' => __FILE__,
        'name' => 'Vector',
        'namemsg' => 'skinname-vector',
-       'descriptionmsg' => 'vector-desc',
+       'descriptionmsg' => 'vector-skin-desc',
        'url' => 'https://www.mediawiki.org/wiki/Skin:Vector',
        'author' => array( 'Trevor Parscal', 'Roan Kattouw', '...' ),
        'license-name' => 'GPLv2+',

diff --git a/skins/Vector/i18n/en.json b/skins/Vector/i18n/en.json
index 6742f2a..949218e 100644 (file)
--- a/skins/Vector/i18n/en.json
+++ b/skins/Vector/i18n/en.json
@@ -3,7 +3,7 @@
                "authors": []
        },
        "skinname-vector": "Vector",
-       "vector-desc": "Modern version of MonoBook with fresh look and many usability improvements",
+       "vector-skin-desc": "Modern version of MonoBook with fresh look and many usability improvements",
        "vector.css": "/* CSS placed here will affect users of the Vector skin */",
        "vector.js": "/* Any JavaScript here will be loaded for users using the Vector skin */",
        "vector-action-addsection": "Add topic",