Merge "Add a composer.local.json-sample"

diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index d6bacd4..2568c9f 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1600,8 +1600,8 @@
        "upload-dialog-title": "Title of the upload dialog box\n{{Identical|Upload file}}",
        "upload-dialog-button-cancel": "Button to cancel the dialog\n{{Identical|Cancel}}",
        "upload-dialog-button-done": "Button to close the dialog once upload is complete\n{{Identical|Done}}",
-       "upload-dialog-button-save": "Button to save the file\n{{Identical|Save}}",
-       "upload-dialog-button-upload": "Button to initiate upload\n{{Identical|Upload}}",
+       "upload-dialog-button-save": "Button to save the file after upload finishes and metadata is filled out, part 2 of a multi-step upload form\n{{Identical|Save}}",
+       "upload-dialog-button-upload": "Button to initiate upload, part 1 of a multi-step upload form\n{{Identical|Upload}}",
        "upload-form-label-select-file": "Label for the select file widget\n{{Identical|Select file}}",
        "upload-form-label-infoform-title": "Title for the information form\n{{Identical|Detail}}",
        "upload-form-label-infoform-name": "Label for the file name input\n{{Identical|Name}}",

diff --git a/package.json b/package.json
index 74eaac5..5a8257c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "grunt-contrib-copy": "0.8.1",
     "grunt-contrib-jshint": "0.11.3",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-jscs": "2.5.0",
+    "grunt-jscs": "2.6.0",
     "grunt-jsonlint": "1.0.7",
     "grunt-karma": "0.12.1",
     "karma": "0.13.19",