Merge branch '2.5' into 2

.travis.yml

@@ -36,7 +36,7 @@ matrix:
       env: DB=PGSQL CORE_RELEASE=3.5
     - php: 5.4
       env: DB=SQLITE
-    - php: 5.3
+    - php: 5.4
       env: DB=MYSQL
     - php: 7.1
       env: DB=MYSQL CORE_RELEASE=3.6

code/forms/gridfield/GridFieldBlogPostState.php

@@ -20,7 +20,7 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState
                 $modifiedLabel = '';
 
                 if ($record->isModifiedOnStage) {
-                    $modifiedLabel = '<span class="modified">' . _t('GridFieldBlogPostState.Modified') . '</span>';
+                    $modifiedLabel = '<span class="modified">' . _t('GridFieldBlogPostState.Modified', 'Modified') . '</span>';
                 }
 
                 if (!$record->isPublished()) {

lang/en.yml

@@ -121,6 +121,7 @@ en:
     PermissionFail: 'You don''t have permission to create a {class}.'
   GridFieldBlogPostState:
     Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}'
+    Modified: 'Modified'
     Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}'
     Timer: '<i class="gridfield-icon blog-icon-timer"></i> Publish at {date}'
   TagCloudWidget: