Merge remote-tracking branch 'origin/1.0'

client/lang/en.js

@@ -19,7 +19,6 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "AssetAdmin.BULK_ACTIONS_PLACEHOLDER": "Select an action...",
     "AssetAdmin.CANCEL": "Cancel",
     "AssetAdmin.CONFIRMDELETE": "Are you sure you want to delete this record?",
-    "AssetAdmin.CONFIRMUNPUBLISH": "Are you sure you want to unpublish this record?",
     "AssetAdmin.CREATED": "First uploaded",
     "AssetAdmin.DELETE": "Delete",
     "AssetAdmin.DIM": "Dimensions",
@@ -47,7 +46,6 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "AssetAdmin.JOIN": ",",
     "AssetAdmin.JOINLAST": "and",
     "AssetAdmin.LASTEDIT": "Last changed",
-    "AssetAdmin.LINKLABEL_FILE": "Link to a file",
     "AssetAdmin.LOADMORE": "Load more",
     "AssetAdmin.NOITEMSFOUND": "No items found",
     "AssetAdmin.PROMPTFOLDERNAME": "Please enter a folder name (or blank to cancel)",

client/lang/src/en.json

@@ -39,7 +39,6 @@
     "AssetAdmin.JOIN": ",",
     "AssetAdmin.JOINLAST": "and",
     "AssetAdmin.LASTEDIT": "Last changed",
-    "AssetAdmin.LINKLABEL_FILE": "Link to a file",
     "AssetAdmin.LOADMORE": "Load more",
     "AssetAdmin.NOITEMSFOUND": "No items found",
     "AssetAdmin.PROMPTFOLDERNAME": "Please enter a folder name (or blank to cancel)",

composer.json

@@ -18,7 +18,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0.x-dev"
+      "dev-master": "1.1.x-dev"
     }
   },
   "scripts": {

lang/en.yml

@@ -60,19 +60,20 @@ en:
   SilverStripe\AssetAdmin\Forms\FileFormFactory:
     INSERT_FILE: 'Insert file'
     INSERT_LINK: 'Link to file'
-    OTHER_ACTIONS: 'Other actions'
-    LINKOPTIONS: 'Link options'
     LINKDESCR: 'Link description'
     LINKOPENNEWWIN: 'Open in new window/tab'
+    LINKOPTIONS: 'Link options'
+    OTHER_ACTIONS: 'Other actions'
   SilverStripe\AssetAdmin\Forms\FileHistoryFormFactory:
     PUBLISHED: Published
     SAVED: Saved
   SilverStripe\AssetAdmin\Forms\FolderCreateFormFactory:
     CREATE: Create
-  SilverStripe\AssetAdmin\Forms\FolderFormFactory:
-    FOLDER_NAME: 'Folder name'
   SilverStripe\AssetAdmin\Forms\RemoteFileFormFactory:
     AddMedia: 'Add media'
     Cancel: Cancel
+    ERROR_ABSOLUTE: 'Only absolute urls can be embedded'
+    ERROR_HOSTNAME: 'This file hostname is not included in the whitelist'
+    ERROR_SCHEME: 'This file scheme is not included in the whitelist'
     InsertMedia: 'Insert media'
     UrlDescription: 'Embed Youtube and Vimeo videos, images and other media directly from the web.'