From 59c0a9210226ae42e14c09375b7072f47b8f61fa Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 3 Jul 2017 17:17:40 +1200
Subject: [PATCH] Update translations

---
 client/lang/en.js       | 2 --
 client/lang/src/en.json | 1 -
 lang/en.yml             | 9 +++++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/lang/en.js b/client/lang/en.js
index ff850cf45..43981ec0e 100644
--- a/client/lang/en.js
+++ b/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)",
diff --git a/client/lang/src/en.json b/client/lang/src/en.json
index b39b16801..f8883b98d 100644
--- a/client/lang/src/en.json
+++ b/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)",
diff --git a/lang/en.yml b/lang/en.yml
index f78c84390..93ce1d12a 100644
--- a/lang/en.yml
+++ b/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.'