Merge branch '3.4' into 3.5

.travis.yml

@@ -7,13 +7,6 @@ addons:
     packages:
       - tidy
 
-env:
-  global:
-    - "ARTIFACTS_AWS_REGION=us-east-1"
-    - "ARTIFACTS_S3_BUCKET=silverstripe-travis-artifacts"
-    - secure: "DjwZKhY/c0wXppGmd8oEMiTV0ayfOXiCmi9Lg1aXoSXNnj+sjLmhYwhUWjehjR6IX0MRtzJG6v7V5Y+4nSGe+i+XIrBQnhPQ95Jrkm1gKofX2mznWTl9npQElNS1DXi58NLPbiB3qxHWGFBRAWmRQrsAouyZabkPnChnSa9ldOg="
-    - secure: "UmbXCNLK0f2Dk+7qX8bOVcgIt4QhRvccoWvMUxaPtIU+95HCbG10eeCxvfOeBax+tHcRXmeCG4vM4tcuT/WoANkAma/VX74DylFjbWhks2tsKOcr2kjTrOwe6Q9CXOBjVAlcx0lnV/a+w83KARjXGnCrIbE7p7r4EDw31rkVufg="
-
 matrix:
   include:
     - php: 5.3
@@ -55,7 +48,7 @@ script:
  - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi"
 
 after_failure:
- - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_AWS_SECRET_ACCESS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_S3_BUCKET/
+ - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/
 
 branches:
   except:
@@ -63,9 +56,3 @@ branches:
     - 2.2
     - 2.3
     - translation-staging
-
-#  global:
-#   - secure: "AZmjVPtUD8JBA7ag4ULlEwEKXSEZbIUjDHeRBFugaOtdsn5yigGLmwYbzsg2tq7k7UkdbbAlGct0SUbiRJb9F2wPA5+eUd/p49fgDIU6CTSWIlT87H2BwgOrxKwS9sDwxLptPFM6vWQ8JKYSNGmVIepie9kQZbu4L2k5k6B69jQ="
-#   - secure: "f3kKpUn9cS5K+p/E52cMqN18cDApol/43LanDmHO6mo3iRAztk3jZLyfNOUq6JASKMqdh8+9kencRpEoaAYbcQnDPoZsT9POResiJ9/ADKB6RwWy+lcFHUp9E2Zf/x2VRh9FmXEguDhpWzkJqzWYJGCSig1IBp/+TjzKnsjQHIY="
-#
-# - php ~/travis-support/travis_setup_sauceconnect.php --if-env BEHAT_TEST --username ${SAUCE_USERNAME} --access-key ${SAUCE_ACCESS_KEY} --tunnel-identifier ${TRAVIS_JOB_NUMBER} --base-url http://localhost

lang/en.yml

@@ -217,15 +217,15 @@ en:
     MODIFIED: Modified
     Mp3Type: "MP3 audio file"
     MpgType: "MPEG video file"
-    NOFILESIZE: "Filesize is zero bytes."
+    NOFILESIZE: "File size is zero bytes."
     NOVALIDUPLOAD: "File is not a valid upload"
     Name: Name
     PLURALNAME: Files
     PdfType: "Adobe Acrobat PDF file"
     PngType: "PNG image - good general-purpose format"
     SINGULARNAME: File
-    TOOLARGE: "Filesize is too large, maximum {size} allowed"
+    TOOLARGE: "File size is too large, maximum {size} allowed"
-    TOOLARGESHORT: "Filesize exceeds {size}"
+    TOOLARGESHORT: "File size exceeds {size}"
     TiffType: "Tagged image format"
     Title: Title
     WavType: "WAV audo file"
@@ -390,8 +390,8 @@ en:
     FROMWEB: "From the web"
     FindInFolder: "Find in Folder"
     IMAGEALT: "Alternative text (alt)"
-    IMAGEALTTEXT: "Alternative text (alt) - shown if image cannot be displayed"
+    IMAGEALTTEXT: "Alternative text (alt) - shown if image can't be displayed"
-    IMAGEALTTEXTDESC: "Shown to screen readers or if image can not be displayed"
+    IMAGEALTTEXTDESC: "Shown to screen readers or if image can't be displayed"
     IMAGEDIMENSIONS: Dimensions
     IMAGEHEIGHTPX: Height
     IMAGETITLE: "Title text (tooltip) - for additional information about the image"
@@ -426,13 +426,13 @@ en:
     CANCEL: Cancel
     CANT_REORGANISE: "You do not have permission to alter Top level pages. Your change was not saved."
     DELETED: Deleted.
-    DropdownBatchActionsDefault: Actions
+    DropdownBatchActionsDefault: "Choose an action..."
     HELP: Help
-    PAGETYPE: "Page type: "
+    PAGETYPE: "Page type"
     PERMAGAIN: "You have been logged out of the CMS.  If you would like to log in again, enter a username and password below."
     PERMALREADY: "I'm sorry, but you can't access that part of the CMS.  If you want to log in as someone else, do so below."
     PERMDEFAULT: "You must be logged in to access the administration area; please enter your credentials below."
-    PLEASESAVE: "Please Save Page: This page could not be upated because it hasn't been saved yet."
+    PLEASESAVE: "Please Save Page: This page could not be updated because it hasn't been saved yet."
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: "Reorganised the site tree successfully."
     SAVEDUP: Saved.
@@ -488,7 +488,7 @@ en:
     SUBJECTPASSWORDRESET: "Your password reset link"
     SURNAME: Surname
     TIMEFORMAT: "Time format"
-    VALIDATIONMEMBEREXISTS: "A member already exists with the same %s"
+    VALIDATIONMEMBEREXISTS: "A member already exists with the same {identifier}"
     ValidationIdentifierFailed: "Can't overwrite existing member #{id} with identical identifier ({name} = {value}))"
     WELCOMEBACK: "Welcome Back, {firstname}"
     YOUROLDPASSWORD: "Your old password"