diff --git a/.upgrade.yml b/.upgrade.yml
index 09719e927..2060a18ea 100644
--- a/.upgrade.yml
+++ b/.upgrade.yml
@@ -1000,6 +1000,19 @@ mappings:
   ConfigTest: SilverStripe\Core\Tests\Config\ConfigTest
   ConfigTest_Config_MemCache: SilverStripe\Core\Tests\Config\ConfigTest\ConfigTestMemCache
   Page_Controller: PageController
+  Boolean: SilverStripe\ORM\FieldType\DBBoolean
+  ChangePasswordEmail_ss: SilverStripe\Control\Email\ChangePasswordEmail.ss
+  CheckboxSetField_ss: SilverStripe\Forms\CheckboxSetField.ss
+  Date: SilverStripe\ORM\FieldType\DBDate
+  Enum: SilverStripe\ORM\FieldType\DBEnum
+  ForgotPasswordEmail_ss: SilverStripe\Control\Email\ChangePasswordEmail.ss
+  GridAction: SilverStripe\Forms\GridField\GridFieldDeleteAction
+  GridFieldAction_Delete: SilverStripe\Forms\GridField\GridFieldDeleteAction
+  GridFieldEditButton_ss: SilverStripe\Forms\GridField\GridFieldEditButton.ss
+  Pagination: SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss
+  TableListField: SilverStripe\Forms\GridField\GridField
+  TableListField_PageControls_ss: SilverStripe\Forms\GridField\GridField
+  UploadField: SilverStripe\AssetAdmin\Forms\UploadField
 skipConfigs:
   - db
   - casting
diff --git a/client/lang/src/af.js b/client/lang/src/af.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/af.js
+++ b/client/lang/src/af.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/ar.js b/client/lang/src/ar.js
index 1c690a08e..18c584587 100644
--- a/client/lang/src/ar.js
+++ b/client/lang/src/ar.js
@@ -9,6 +9,24 @@
     "LOADING": "جاري التحميل...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "الحرف '%s' لا يمكن استخدامه في هذا الحقل",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "متصفحك لا يتوافق مع واجهة ، يرجى استخدام Internet Explorer 7+ أو Google Chrome 10+ أو Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "هل أنت متأكد من رغبتك في إزالة هذا الملف من نظام ملفات الخادم؟",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "نتيجة تحميل ملف فارغ",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "جاري التحرير...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "يتجاوز الملف MAX_FILE_SIZE (توجيه نموذج HTML)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "الملحق غيرمسموح به",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "جاري التحميل ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "تم تجاوز الحد الأقصى من الملفات",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "لم يتم تحميل أي ملف",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "المجلد المؤقت مفقود",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "تم تحميل الملف بشكل جزئي فقط",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "يوجد ملف يحمل نفس الاسم",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "يتجاوز الملف upload_max_filesize (توجيه php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "تم إيقاف تحميل الملف من خلال الملحق",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "حجم الملف كبير للغاية",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "حجم الملف صغير للغاية",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "تتجاوز وحدات البايت المحملة حجم الملف",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "تم الرفع",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "فشل في إرسال الملف إلى القرص",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "قام بتغيير القيمة إلى '%s' : %s",
     "UPDATEURL.CONFIRM": "هل تريد مني تغيير عنوان URL إلى:\n\n%s\/\n\nانقر فوق ’موافق‘ لتغيير عنوان URL، اضغط على ’إلغاء‘ لتتركه على النحو التالي:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "المسار \"URL\" تم تغييره إلى \n'%s'",
-    "UploadField.ConfirmDelete": "هل أنت متأكد من رغبتك في إزالة هذا الملف من نظام ملفات الخادم؟",
-    "UploadField.EMPTYRESULT": "نتيجة تحميل ملف فارغ",
-    "UploadField.Editing": "جاري التحرير...",
-    "UploadField.HTML_MAXFILESIZE": "يتجاوز الملف MAX_FILE_SIZE (توجيه نموذج HTML)",
-    "UploadField.INVALIDEXTENSION": "الملحق غيرمسموح به",
-    "UploadField.LOADING": "جاري التحميل ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "تم تجاوز الحد الأقصى من الملفات",
-    "UploadField.NOFILEUPLOADED": "لم يتم تحميل أي ملف",
-    "UploadField.NOTMPFOLDER": "المجلد المؤقت مفقود",
-    "UploadField.ONLYPARTIALUPLOADED": "تم تحميل الملف بشكل جزئي فقط",
-    "UploadField.OVERWRITEWARNING": "يوجد ملف يحمل نفس الاسم",
-    "UploadField.PHP_MAXFILESIZE": "يتجاوز الملف upload_max_filesize (توجيه php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "تم إيقاف تحميل الملف من خلال الملحق",
-    "UploadField.TOOLARGE": "حجم الملف كبير للغاية",
-    "UploadField.TOOSMALL": "حجم الملف صغير للغاية",
-    "UploadField.UPLOADEDBYTES": "تتجاوز وحدات البايت المحملة حجم الملف",
-    "UploadField.Uploaded": "تم الرفع",
-    "UploadField.WRITEFAILED": "فشل في إرسال الملف إلى القرص",
     "VALIDATOR.FIELDREQUIRED": "من فضلك املأ \"%s\"، فهو من البيانات المطلوبة."
 }
\ No newline at end of file
diff --git a/client/lang/src/ast.js b/client/lang/src/ast.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/ast.js
+++ b/client/lang/src/ast.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/az.js b/client/lang/src/az.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/az.js
+++ b/client/lang/src/az.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/bg.js b/client/lang/src/bg.js
index 8594ffc00..8bb7c9d66 100644
--- a/client/lang/src/bg.js
+++ b/client/lang/src/bg.js
@@ -9,6 +9,24 @@
     "LOADING": "зареждане...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Символът '%s' не може да бъде използван в това поле",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Този файл ще бъде изтрит от сървъра. Сигурни ли сте?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Редактиране ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Големината на файла надхвърле MAX_FILE_SIZE (директива на HTML формата)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Това разширение не е разрешено",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Зареждане ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Максималния брой файлове е надхвърлен",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Файлът не беше качен",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Липсва временна папка",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Файлът беше качен частично",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Вече съществува файл с това име",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Големината на файла надхвърля upload_max_filesize (php.ini директивата)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Много голям файл",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Файлът е много малък",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Качен",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Файлът не можа да бъде записан",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Стойността е променена '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL адресът беше сменен на\n'%s'",
-    "UploadField.ConfirmDelete": "Този файл ще бъде изтрит от сървъра. Сигурни ли сте?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Редактиране ...",
-    "UploadField.HTML_MAXFILESIZE": "Големината на файла надхвърле MAX_FILE_SIZE (директива на HTML формата)",
-    "UploadField.INVALIDEXTENSION": "Това разширение не е разрешено",
-    "UploadField.LOADING": "Зареждане ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Максималния брой файлове е надхвърлен",
-    "UploadField.NOFILEUPLOADED": "Файлът не беше качен",
-    "UploadField.NOTMPFOLDER": "Липсва временна папка",
-    "UploadField.ONLYPARTIALUPLOADED": "Файлът беше качен частично",
-    "UploadField.OVERWRITEWARNING": "Вече съществува файл с това име",
-    "UploadField.PHP_MAXFILESIZE": "Големината на файла надхвърля upload_max_filesize (php.ini директивата)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Много голям файл",
-    "UploadField.TOOSMALL": "Файлът е много малък",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Качен",
-    "UploadField.WRITEFAILED": "Файлът не можа да бъде записан",
     "VALIDATOR.FIELDREQUIRED": "Полето \"%s\" е задължително."
 }
\ No newline at end of file
diff --git a/client/lang/src/bs.js b/client/lang/src/bs.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/bs.js
+++ b/client/lang/src/bs.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/ca.js b/client/lang/src/ca.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/ca.js
+++ b/client/lang/src/ca.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/cs.js b/client/lang/src/cs.js
index f55f978e1..e4d9ff965 100644
--- a/client/lang/src/cs.js
+++ b/client/lang/src/cs.js
@@ -9,6 +9,24 @@
     "LOADING": "natahování...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "V tomto poli znak '%s' nesmí být použit",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Váš prohlížeč není kompatibilní s CMS prosředím. Prosím použijte Internet Explorer 7+, Google Chrome 10+ nebo Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Určitě chcete odstranit tento soubor ze serverového úložiště?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Výsledek nahráni prázdný soubor",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editování ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Soubor překračuje MAX_FILE_SIZE (HTML formulář direktiva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extenze není povolena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Natahování ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Maximální počet souborů překročen",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Soubor nebyl nahrán",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Chybějící dočasná složka",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Soubor byl pouye částečně nahrán",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Soubor se stejným názvem již existuje",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Soubor překročil upload_max_filesize (php.ini direktiva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Nahrání souboru zastaveno pro extenzi",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Velikost souboru je příliž velká",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Velikost souboru je příliž malá",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Nahrané byty překročily velikost souboru",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Nahráno",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Chyba zápisu souboru na disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Hodnota změněna na '%s' : %s",
     "UPDATEURL.CONFIRM": "Chtěli byste změnit URL na:\n\n%s\n\nKlikněte OK pro změnu URL, klikněte Cancel pro ponechání původního:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL bylo yměněno na\n'%s'",
-    "UploadField.ConfirmDelete": "Určitě chcete odstranit tento soubor ze serverového úložiště?",
-    "UploadField.EMPTYRESULT": "Výsledek nahráni prázdný soubor",
-    "UploadField.Editing": "Editování ...",
-    "UploadField.HTML_MAXFILESIZE": "Soubor překračuje MAX_FILE_SIZE (HTML formulář direktiva)",
-    "UploadField.INVALIDEXTENSION": "Extenze není povolena",
-    "UploadField.LOADING": "Natahování ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Maximální počet souborů překročen",
-    "UploadField.NOFILEUPLOADED": "Soubor nebyl nahrán",
-    "UploadField.NOTMPFOLDER": "Chybějící dočasná složka",
-    "UploadField.ONLYPARTIALUPLOADED": "Soubor byl pouye částečně nahrán",
-    "UploadField.OVERWRITEWARNING": "Soubor se stejným názvem již existuje",
-    "UploadField.PHP_MAXFILESIZE": "Soubor překročil upload_max_filesize (php.ini direktiva)",
-    "UploadField.STOPEDBYEXTENSION": "Nahrání souboru zastaveno pro extenzi",
-    "UploadField.TOOLARGE": "Velikost souboru je příliž velká",
-    "UploadField.TOOSMALL": "Velikost souboru je příliž malá",
-    "UploadField.UPLOADEDBYTES": "Nahrané byty překročily velikost souboru",
-    "UploadField.Uploaded": "Nahráno",
-    "UploadField.WRITEFAILED": "Chyba zápisu souboru na disk",
     "VALIDATOR.FIELDREQUIRED": "Vyplňte \"%s\", prosím, je vyžadováno."
 }
\ No newline at end of file
diff --git a/client/lang/src/cs_CZ.js b/client/lang/src/cs_CZ.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/cs_CZ.js
+++ b/client/lang/src/cs_CZ.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/da.js b/client/lang/src/da.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/da.js
+++ b/client/lang/src/da.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/de.js b/client/lang/src/de.js
index 1aee1f3c0..9b664007e 100644
--- a/client/lang/src/de.js
+++ b/client/lang/src/de.js
@@ -9,6 +9,24 @@
     "LOADING": "Lädt...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Das Zeichen '%s' darf in diesem Feld nicht vewendet werden",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Ihr Browser ist nicht kompatibel mit der CMS Benutzeroverfläche. Bitte benutzen sie Internet Explorer 7+, Google Chrome 10+ oder Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Sind sie sicher, dass sie diese Datei aus dem Dateisystem löschen wollen?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Leere Datei erhalten",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Bearbeite ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Die Dateigröße überschreitet MAX_FILE_SIZE (HTML Form Einstellung)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Dateierweiterung ist nicht erlaubt",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Lädt ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Maximal erlaubt Anzahl von Dateien überschritten",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Keine Datei wurde hochgeladen",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Es wurde kein temporäres Verzeichnis gefunden",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Die Datei wurde nur teilweise hochgeladen",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Datei mit diesem Namen existiert bereits",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Die Dateigröße überschreitet upload_max_filesize (php.ini Einstellung)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Dateiupload wurde wegen einer nicht erlaubten Erweiterung gestoppt",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Die Datei ist zu groß",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Die Datei ist zu klein",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Hochgeladene Bytes überschreiten Dateigröße",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Hochgeladen",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Es konnte nicht auf die Festplatte geschrieben werden",
     "SilverStripe\\Assets\\File.DRAFT": "Entwurf",
     "SilverStripe\\Assets\\File.MODIFIED": "Zuletzt geändert",
     "SilverStripe\\Assets\\File.PUBLISHED": "Veröffentlicht",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Der Wert wurde nach '%s' geändert : %s",
     "UPDATEURL.CONFIRM": "Sollen wir die URL in diesen Wert ändern:\n\n%s\/\n\nKlicken Sie OK, um den URL zu ändern, Abbrechen um ihn so zu lassen:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "Die URL wurde geändert:\n\"%s\"",
-    "UploadField.ConfirmDelete": "Sind sie sicher, dass sie diese Datei aus dem Dateisystem löschen wollen?",
-    "UploadField.EMPTYRESULT": "Leere Datei erhalten",
-    "UploadField.Editing": "Bearbeite ...",
-    "UploadField.HTML_MAXFILESIZE": "Die Dateigröße überschreitet MAX_FILE_SIZE (HTML Form Einstellung)",
-    "UploadField.INVALIDEXTENSION": "Dateierweiterung ist nicht erlaubt",
-    "UploadField.LOADING": "Lädt ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Maximal erlaubt Anzahl von Dateien überschritten",
-    "UploadField.NOFILEUPLOADED": "Keine Datei wurde hochgeladen",
-    "UploadField.NOTMPFOLDER": "Es wurde kein temporäres Verzeichnis gefunden",
-    "UploadField.ONLYPARTIALUPLOADED": "Die Datei wurde nur teilweise hochgeladen",
-    "UploadField.OVERWRITEWARNING": "Datei mit diesem Namen existiert bereits",
-    "UploadField.PHP_MAXFILESIZE": "Die Dateigröße überschreitet upload_max_filesize (php.ini Einstellung)",
-    "UploadField.STOPEDBYEXTENSION": "Dateiupload wurde wegen einer nicht erlaubten Erweiterung gestoppt",
-    "UploadField.TOOLARGE": "Die Datei ist zu groß",
-    "UploadField.TOOSMALL": "Die Datei ist zu klein",
-    "UploadField.UPLOADEDBYTES": "Hochgeladene Bytes überschreiten Dateigröße",
-    "UploadField.Uploaded": "Hochgeladen",
-    "UploadField.WRITEFAILED": "Es konnte nicht auf die Festplatte geschrieben werden",
     "VALIDATOR.FIELDREQUIRED": "\"%s\" wird benötigt"
 }
\ No newline at end of file
diff --git a/client/lang/src/de_DE.js b/client/lang/src/de_DE.js
index 969275c05..07c63a192 100644
--- a/client/lang/src/de_DE.js
+++ b/client/lang/src/de_DE.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/el.js b/client/lang/src/el.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/el.js
+++ b/client/lang/src/el.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/en.js b/client/lang/src/en.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/en.js
+++ b/client/lang/src/en.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/en_GB.js b/client/lang/src/en_GB.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/en_GB.js
+++ b/client/lang/src/en_GB.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/eo.js b/client/lang/src/eo.js
index 4bcc06a45..840ddfb80 100644
--- a/client/lang/src/eo.js
+++ b/client/lang/src/eo.js
@@ -9,6 +9,24 @@
     "LOADING": "ŝargas...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "La signo '%s' ne estas uzebla en ĉi tiu kampo",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Via foliumilo ne kongruas kun la CMS-fasado. Bonvole uzu je Explorer 7+, Google Chrome 10+ aŭ Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Ĉi vi vere volas forigi ĉi tiun dosieron el la servila dosierujo?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Vaka dosiero alŝute rezultis",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Redaktas...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "La dosiero superas maksimuman dosiergrandon (HTML-formulara direktivo)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Malvalida sufikso",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Ŝargas...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Superis maksimuman nombron da dosieroj",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Neniu dosiero alŝutiĝis",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Mankas provizora dosierujo",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Dosiero nur parte alŝutiĝis",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Jam ekzistas dosiero samnoma",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Dosiero superas alŝutan maksimuman grandon (php.ini direktivo)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Kromprogramo haltigis dosieran alŝuton",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Dosiero estas tro granda",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "La dosiero estas tro malgranda",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Elŝutitaj bajtoj superas grandon de dosiero",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Alŝutita",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Malsukcesis skribi dosieron al disko",
     "SilverStripe\\Assets\\File.DRAFT": "Malneto",
     "SilverStripe\\Assets\\File.MODIFIED": "Ŝanĝita",
     "SilverStripe\\Assets\\File.PUBLISHED": "Publikigita",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Ŝanĝis valoron al '%s' : %s",
     "UPDATEURL.CONFIRM": "Ĉu vi deziras ke mi ŝanĝu je la URL al:\n\n%s\/\n\nKlaku al Akcepti por ke la URL ŝanĝiĝu, aŭ klaku al Nuligi por lasi ĝin kiel:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "La URL estas ŝanĝita al\n'%s'",
-    "UploadField.ConfirmDelete": "Ĉi vi vere volas forigi ĉi tiun dosieron el la servila dosierujo?",
-    "UploadField.EMPTYRESULT": "Vaka dosiero alŝute rezultis",
-    "UploadField.Editing": "Redaktas...",
-    "UploadField.HTML_MAXFILESIZE": "La dosiero superas maksimuman dosiergrandon (HTML-formulara direktivo)",
-    "UploadField.INVALIDEXTENSION": "Malvalida sufikso",
-    "UploadField.LOADING": "Ŝargas...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Superis maksimuman nombron da dosieroj",
-    "UploadField.NOFILEUPLOADED": "Neniu dosiero alŝutiĝis",
-    "UploadField.NOTMPFOLDER": "Mankas provizora dosierujo",
-    "UploadField.ONLYPARTIALUPLOADED": "Dosiero nur parte alŝutiĝis",
-    "UploadField.OVERWRITEWARNING": "Jam ekzistas dosiero samnoma",
-    "UploadField.PHP_MAXFILESIZE": "Dosiero superas alŝutan maksimuman grandon (php.ini direktivo)",
-    "UploadField.STOPEDBYEXTENSION": "Kromprogramo haltigis dosieran alŝuton",
-    "UploadField.TOOLARGE": "Dosiero estas tro granda",
-    "UploadField.TOOSMALL": "La dosiero estas tro malgranda",
-    "UploadField.UPLOADEDBYTES": "Elŝutitaj bajtoj superas grandon de dosiero",
-    "UploadField.Uploaded": "Alŝutita",
-    "UploadField.WRITEFAILED": "Malsukcesis skribi dosieron al disko",
     "VALIDATOR.FIELDREQUIRED": "Bonvole plenumu je \"%s\". Ĝi estas nepra."
 }
\ No newline at end of file
diff --git a/client/lang/src/es.js b/client/lang/src/es.js
index ff305ccb8..f7231fe7d 100644
--- a/client/lang/src/es.js
+++ b/client/lang/src/es.js
@@ -9,6 +9,24 @@
     "LOADING": "cargando",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "El caracter '%s' no puede ser utilizado en este campo",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Tu navegador no es compatible con la interfaz del CMS. Por favor utilizar Internet Explorer 7+, Google Chrome 10+ o Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "¿Estás seguro que quieres remover este archivo del servidor?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Resultado de la subida de archivos nula",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editando ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "El archivo excede el MAX_FILE_SIZE (directiva de formulario HTML)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extensión no permitida",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Cargando ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Se superó el máximo de archivos",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No se subieron archivos",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Falta una carpeta temporal",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "El archivo solo se subió parcialmente",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Ya existe un archivo con el mismo nombre",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "El tamaño del archivo supera upload_max_filesize (configuración en php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Carga de archivos detenida por extensión",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "El archivo es muy grande",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "El archivo es demasiado pequeño",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Bytes cargados superan el tamaño del archivo",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Cargado",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "No se pudo escribir el archivo al disco",
     "SilverStripe\\Assets\\File.DRAFT": "Borrador",
     "SilverStripe\\Assets\\File.MODIFIED": "Modificado",
     "SilverStripe\\Assets\\File.PUBLISHED": "Publicado",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Cambiado valor de '%s' a %s",
     "UPDATEURL.CONFIRM": "Quieres cambiar la URL a:⏎\n⏎\n%s\/⏎\n⏎\nClick Ok para cambiar la URL, click Cancelar para dejar como está:⏎\n⏎\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "La URL ha sido cambiada a⏎\n'%s'",
-    "UploadField.ConfirmDelete": "¿Estás seguro que quieres remover este archivo del servidor?",
-    "UploadField.EMPTYRESULT": "Resultado de la subida de archivos nula",
-    "UploadField.Editing": "Editando ...",
-    "UploadField.HTML_MAXFILESIZE": "El archivo excede el MAX_FILE_SIZE (directiva de formulario HTML)",
-    "UploadField.INVALIDEXTENSION": "Extensión no permitida",
-    "UploadField.LOADING": "Cargando ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Se superó el máximo de archivos",
-    "UploadField.NOFILEUPLOADED": "No se subieron archivos",
-    "UploadField.NOTMPFOLDER": "Falta una carpeta temporal",
-    "UploadField.ONLYPARTIALUPLOADED": "El archivo solo se subió parcialmente",
-    "UploadField.OVERWRITEWARNING": "Ya existe un archivo con el mismo nombre",
-    "UploadField.PHP_MAXFILESIZE": "El tamaño del archivo supera upload_max_filesize (configuración en php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "Carga de archivos detenida por extensión",
-    "UploadField.TOOLARGE": "El archivo es muy grande",
-    "UploadField.TOOSMALL": "El archivo es demasiado pequeño",
-    "UploadField.UPLOADEDBYTES": "Bytes cargados superan el tamaño del archivo",
-    "UploadField.Uploaded": "Cargado",
-    "UploadField.WRITEFAILED": "No se pudo escribir el archivo al disco",
     "VALIDATOR.FIELDREQUIRED": "Por favor complete \"%s\", es un campo requerido."
 }
\ No newline at end of file
diff --git a/client/lang/src/es_AR.js b/client/lang/src/es_AR.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/es_AR.js
+++ b/client/lang/src/es_AR.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/es_MX.js b/client/lang/src/es_MX.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/es_MX.js
+++ b/client/lang/src/es_MX.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/et_EE.js b/client/lang/src/et_EE.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/et_EE.js
+++ b/client/lang/src/et_EE.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/fa.js b/client/lang/src/fa.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/fa.js
+++ b/client/lang/src/fa.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/fa_IR.js b/client/lang/src/fa_IR.js
index 59f682306..a938ce980 100644
--- a/client/lang/src/fa_IR.js
+++ b/client/lang/src/fa_IR.js
@@ -9,6 +9,24 @@
     "LOADING": "بارگذاری...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "کاراکتر '%s' نمی‌تواند در این فیلد استفاده شود",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "مرورگر شما با محیط کاربری سی‌ام‌اس سازگار نیست. لطفاً از اینترنت اکسپلورر نسخه 7 به بعد، گوگل کروم 10 به بعد یا موزیلا فایرفاکس 3.5 به بعد استفاده کنید.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "آیا مطمئن هستید که می‌خواهید این فایل از فایل‌سیستم سرور حذف شود؟",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "نتیجه‌ی آپلود فایل خالی است",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "ویراستن ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "فایل از MAX_FILE_SIZE تجاوز می‌کند (اچ‌تی‌ام‌ال از متضمن دستور)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "قالب مجاز نیست",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "بارگذاری ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "از حداکثر تعداد فایل تجاوز کرد",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "هیچ فایلی آپلود نشد",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "پوشه‌ی موقت پیدا نشد",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "تنها بخش‌هایی از فایل آپلود شده است",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "فایل با نام یکسان از پیش وجود دارد",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "فایل از upload_max_filesize تجاوز می‌کند (متضمن دستور php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "آپلود فایل به دلیل قالب متوقف شد",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "حجم فایل بسیار زیاد است",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "حجم فایل بسیار کم است",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "بایت‌های آپلودشده از سایز فایل تجاوز می‌کند",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "آپلود‌شده",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "ناتوان از نگارش فایل بر هارددیسک",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "ارزش به '%s' : %s تغییر کرد",
     "UPDATEURL.CONFIRM": "آیا می‌خواهید که نشانی اینترنتی را تغییر دهم به:\n\n%s\/\n\nبله را کلیک نمایید تا نشانی تغییر یابد، لغو را کلیک کنید تا بدین شکل باقی بماند:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "نشانی اینترنتی تغییر یافت به\n'%s'",
-    "UploadField.ConfirmDelete": "آیا مطمئن هستید که می‌خواهید این فایل از فایل‌سیستم سرور حذف شود؟",
-    "UploadField.EMPTYRESULT": "نتیجه‌ی آپلود فایل خالی است",
-    "UploadField.Editing": "ویراستن ...",
-    "UploadField.HTML_MAXFILESIZE": "فایل از MAX_FILE_SIZE تجاوز می‌کند (اچ‌تی‌ام‌ال از متضمن دستور)",
-    "UploadField.INVALIDEXTENSION": "قالب مجاز نیست",
-    "UploadField.LOADING": "بارگذاری ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "از حداکثر تعداد فایل تجاوز کرد",
-    "UploadField.NOFILEUPLOADED": "هیچ فایلی آپلود نشد",
-    "UploadField.NOTMPFOLDER": "پوشه‌ی موقت پیدا نشد",
-    "UploadField.ONLYPARTIALUPLOADED": "تنها بخش‌هایی از فایل آپلود شده است",
-    "UploadField.OVERWRITEWARNING": "فایل با نام یکسان از پیش وجود دارد",
-    "UploadField.PHP_MAXFILESIZE": "فایل از upload_max_filesize تجاوز می‌کند (متضمن دستور php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "آپلود فایل به دلیل قالب متوقف شد",
-    "UploadField.TOOLARGE": "حجم فایل بسیار زیاد است",
-    "UploadField.TOOSMALL": "حجم فایل بسیار کم است",
-    "UploadField.UPLOADEDBYTES": "بایت‌های آپلودشده از سایز فایل تجاوز می‌کند",
-    "UploadField.Uploaded": "آپلود‌شده",
-    "UploadField.WRITEFAILED": "ناتوان از نگارش فایل بر هارددیسک",
     "VALIDATOR.FIELDREQUIRED": "لطفاً \"%s\" را تکمیل نمایید، پرکردن آن الزامی است."
 }
\ No newline at end of file
diff --git a/client/lang/src/fi.js b/client/lang/src/fi.js
index 7c98b17a7..feb1d1c88 100644
--- a/client/lang/src/fi.js
+++ b/client/lang/src/fi.js
@@ -9,6 +9,24 @@
     "LOADING": "ladataan...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Merkkiä '%s' ei voi käyttää tässä kentässä",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Selaimesi ei ole yhteensopiva julkaisujärjestelmän kanssa. Käytä Internet Explorer 7+, Google Chrome 10+ tai Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Haluatko varmasti poistaa tämän tiedoston palvelimelta?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Tiedostolatauksen tulos tyhjä",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Muokataan ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Tiedostokoko ylittää MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Tiedostopääte ei ole sallittu",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Ladataan...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Suurin sallittu määrä tiedostoja ylitetty.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Tiedostoa ei ladattu",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Tilapäinen kansio puuttuu",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Tiedosto ladattiin vain osittain",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Samanniminen tiedosto on jo palvelimella",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Tiedostokoko ylittää upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Tiedostolataus keskeytetty laajennoksen toimesta",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Tiedostokoko on liian suuri",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Tiedostokoko on liian pieni",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Ladatut tavut ylittävät tiedostokoon",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Ladattu",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Tiedoston kirjoittaminen levylle epäonnistui",
     "SilverStripe\\Assets\\File.DRAFT": "Luonnos",
     "SilverStripe\\Assets\\File.MODIFIED": "Muokattu",
     "SilverStripe\\Assets\\File.PUBLISHED": "Julkaistu",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Muutettu arvoksi '%s' : %s",
     "UPDATEURL.CONFIRM": "Haluatko muuttaa URL:ksi:\n\n%s\/\n\nKlikkaa OK muuttaaksesi URL:n, klikkaa Peruuta jättääksesi sen ennalleen:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL on muutettu muotoon\n'%s'",
-    "UploadField.ConfirmDelete": "Haluatko varmasti poistaa tämän tiedoston palvelimelta?",
-    "UploadField.EMPTYRESULT": "Tiedostolatauksen tulos tyhjä",
-    "UploadField.Editing": "Muokataan ...",
-    "UploadField.HTML_MAXFILESIZE": "Tiedostokoko ylittää MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Tiedostopääte ei ole sallittu",
-    "UploadField.LOADING": "Ladataan...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Suurin sallittu määrä tiedostoja ylitetty.",
-    "UploadField.NOFILEUPLOADED": "Tiedostoa ei ladattu",
-    "UploadField.NOTMPFOLDER": "Tilapäinen kansio puuttuu",
-    "UploadField.ONLYPARTIALUPLOADED": "Tiedosto ladattiin vain osittain",
-    "UploadField.OVERWRITEWARNING": "Samanniminen tiedosto on jo palvelimella",
-    "UploadField.PHP_MAXFILESIZE": "Tiedostokoko ylittää upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "Tiedostolataus keskeytetty laajennoksen toimesta",
-    "UploadField.TOOLARGE": "Tiedostokoko on liian suuri",
-    "UploadField.TOOSMALL": "Tiedostokoko on liian pieni",
-    "UploadField.UPLOADEDBYTES": "Ladatut tavut ylittävät tiedostokoon",
-    "UploadField.Uploaded": "Ladattu",
-    "UploadField.WRITEFAILED": "Tiedoston kirjoittaminen levylle epäonnistui",
     "VALIDATOR.FIELDREQUIRED": "Syötä \"%s\", se on vaadittu tieto."
 }
\ No newline at end of file
diff --git a/client/lang/src/fi_FI.js b/client/lang/src/fi_FI.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/fi_FI.js
+++ b/client/lang/src/fi_FI.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/fo.js b/client/lang/src/fo.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/fo.js
+++ b/client/lang/src/fo.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/fr.js b/client/lang/src/fr.js
index 2a9cfd2a3..840b9cd6b 100644
--- a/client/lang/src/fr.js
+++ b/client/lang/src/fr.js
@@ -9,6 +9,24 @@
     "LOADING": "chargement...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Le character '%s' ne peut être utilisé dans ce champ",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changez la valeur de '%s' : %s",
     "UPDATEURL.CONFIRM": "Voulez-vous que je change l'URL en:\n\n%s\/\n\nCliquez Ok pour changer l'URL, cliquez Annuler pour la laisser à:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Veuillez remplir \"%s\", c'est un champ requis."
 }
\ No newline at end of file
diff --git a/client/lang/src/gl_ES.js b/client/lang/src/gl_ES.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/gl_ES.js
+++ b/client/lang/src/gl_ES.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/he_IL.js b/client/lang/src/he_IL.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/he_IL.js
+++ b/client/lang/src/he_IL.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/hi.js b/client/lang/src/hi.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/hi.js
+++ b/client/lang/src/hi.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/hr.js b/client/lang/src/hr.js
index 05635ff8b..15c9cc627 100644
--- a/client/lang/src/hr.js
+++ b/client/lang/src/hr.js
@@ -9,6 +9,24 @@
     "LOADING": "učitavam...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Znak '%s' nije moguće koristiti u ovom polju",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Vaš browser nije kompatibilan s CMS sučeljem. Molimo koristite Internet Explorer 7+, Google Chrome 10+ ili Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Da li ste sigurni da želite ukloniti ovu datoteku s serverskog sustava datoteka?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Prazan rezultat prijenosa datoteke",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Uređujem...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Datoteka premašuje MAX_FILE_SIZE (HTML form direktiva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Ekstenzija nije dozvoljena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Učitavam ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Maksimalan broj datoteka premašen",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Datoteka nije uploadana",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Nedostaje privremeni direktorij",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Datoteka je djelimično uploadana",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Datoteka s istim imenom već postoji",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Datoteka premašuje upload_max_filesize (php.ini direktiva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Prijenos datoteke zaustavljen od ekstenzije",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Veličina datoteke je prevelika",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Veličina datoteke je premala",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Preneseni bitovi premašuju veličinu datoteke",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Prenešeno",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Nije uspjelo zapisati datoteku na disk",
     "SilverStripe\\Assets\\File.DRAFT": "Predložak",
     "SilverStripe\\Assets\\File.MODIFIED": "Izmjenjeno",
     "SilverStripe\\Assets\\File.PUBLISHED": "Objavljeno",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Promjenjene vrijednosti u '%s' : %s",
     "UPDATEURL.CONFIRM": "Želite li promjeniti URL u:\n\n%s\/\n\nKliknite Ok za promjenu URL, kliknite Odustani da ostane kakav je:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL je promjenjen u\n'%s'",
-    "UploadField.ConfirmDelete": "Da li ste sigurni da želite ukloniti ovu datoteku s serverskog sustava datoteka?",
-    "UploadField.EMPTYRESULT": "Prazan rezultat prijenosa datoteke",
-    "UploadField.Editing": "Uređujem...",
-    "UploadField.HTML_MAXFILESIZE": "Datoteka premašuje MAX_FILE_SIZE (HTML form direktiva)",
-    "UploadField.INVALIDEXTENSION": "Ekstenzija nije dozvoljena",
-    "UploadField.LOADING": "Učitavam ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Maksimalan broj datoteka premašen",
-    "UploadField.NOFILEUPLOADED": "Datoteka nije uploadana",
-    "UploadField.NOTMPFOLDER": "Nedostaje privremeni direktorij",
-    "UploadField.ONLYPARTIALUPLOADED": "Datoteka je djelimično uploadana",
-    "UploadField.OVERWRITEWARNING": "Datoteka s istim imenom već postoji",
-    "UploadField.PHP_MAXFILESIZE": "Datoteka premašuje upload_max_filesize (php.ini direktiva)",
-    "UploadField.STOPEDBYEXTENSION": "Prijenos datoteke zaustavljen od ekstenzije",
-    "UploadField.TOOLARGE": "Veličina datoteke je prevelika",
-    "UploadField.TOOSMALL": "Veličina datoteke je premala",
-    "UploadField.UPLOADEDBYTES": "Preneseni bitovi premašuju veličinu datoteke",
-    "UploadField.Uploaded": "Prenešeno",
-    "UploadField.WRITEFAILED": "Nije uspjelo zapisati datoteku na disk",
     "VALIDATOR.FIELDREQUIRED": "Molimo popunite \"%s\",  obavezno je."
 }
\ No newline at end of file
diff --git a/client/lang/src/hu.js b/client/lang/src/hu.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/hu.js
+++ b/client/lang/src/hu.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/hy_AM.js b/client/lang/src/hy_AM.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/hy_AM.js
+++ b/client/lang/src/hy_AM.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/id.js b/client/lang/src/id.js
index 0eb6a8402..adfcb0856 100644
--- a/client/lang/src/id.js
+++ b/client/lang/src/id.js
@@ -9,6 +9,24 @@
     "LOADING": "memuat...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Karakter '%s' tidak diijinkan pada isian ini",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Browser Anda tidak mendukung antarmuka CMS. Mohon gunakan Internet Explorer 7+, Google Chrome 10+ atau Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Anda ingin menghapus berkas ini dari sistem berkas server?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Pengunggahan menghasilkan berkas kosong",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Mengedit...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Ukuran berkas melebihi MAX_FILE_SIZE (direktif HTML form)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Ekstensi berkas tidak diijinkan",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Memuat...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Jumlah maksimal berkas sudah terlampaui",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Tidak ada berkas terunggah",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Folder sementara tidak ditemukan",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Berkas hanya sebagian terunggah",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Berkas dengan nama sama sudah ada",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Ukuran berkas melebihi upload_max_filesize (direktif php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Ekstensi berkas yang diunggah tidak diijinkan",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Ukuran berkas terlalu besar",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Ukuran berkas terlalu kecil",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Berkas yang diunggah melebihi batas ukuran berkas",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Terunggah",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Gagal menyimpan berkas",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Nilai diubah ke '%s' : %s",
     "UPDATEURL.CONFIRM": "Anda ingin mengubah URL ke:\n\n%s\/\n\nKlik OK untuk lanjut, atau klik Batal untuk tetap pada:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL sudah diubah ke\n'%s'",
-    "UploadField.ConfirmDelete": "Anda ingin menghapus berkas ini dari sistem berkas server?",
-    "UploadField.EMPTYRESULT": "Pengunggahan menghasilkan berkas kosong",
-    "UploadField.Editing": "Mengedit...",
-    "UploadField.HTML_MAXFILESIZE": "Ukuran berkas melebihi MAX_FILE_SIZE (direktif HTML form)",
-    "UploadField.INVALIDEXTENSION": "Ekstensi berkas tidak diijinkan",
-    "UploadField.LOADING": "Memuat...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Jumlah maksimal berkas sudah terlampaui",
-    "UploadField.NOFILEUPLOADED": "Tidak ada berkas terunggah",
-    "UploadField.NOTMPFOLDER": "Folder sementara tidak ditemukan",
-    "UploadField.ONLYPARTIALUPLOADED": "Berkas hanya sebagian terunggah",
-    "UploadField.OVERWRITEWARNING": "Berkas dengan nama sama sudah ada",
-    "UploadField.PHP_MAXFILESIZE": "Ukuran berkas melebihi upload_max_filesize (direktif php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "Ekstensi berkas yang diunggah tidak diijinkan",
-    "UploadField.TOOLARGE": "Ukuran berkas terlalu besar",
-    "UploadField.TOOSMALL": "Ukuran berkas terlalu kecil",
-    "UploadField.UPLOADEDBYTES": "Berkas yang diunggah melebihi batas ukuran berkas",
-    "UploadField.Uploaded": "Terunggah",
-    "UploadField.WRITEFAILED": "Gagal menyimpan berkas",
     "VALIDATOR.FIELDREQUIRED": "Anda wajib mengisi \"%s\"."
 }
\ No newline at end of file
diff --git a/client/lang/src/id_ID.js b/client/lang/src/id_ID.js
index 0eb6a8402..adfcb0856 100644
--- a/client/lang/src/id_ID.js
+++ b/client/lang/src/id_ID.js
@@ -9,6 +9,24 @@
     "LOADING": "memuat...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Karakter '%s' tidak diijinkan pada isian ini",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Browser Anda tidak mendukung antarmuka CMS. Mohon gunakan Internet Explorer 7+, Google Chrome 10+ atau Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Anda ingin menghapus berkas ini dari sistem berkas server?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Pengunggahan menghasilkan berkas kosong",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Mengedit...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Ukuran berkas melebihi MAX_FILE_SIZE (direktif HTML form)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Ekstensi berkas tidak diijinkan",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Memuat...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Jumlah maksimal berkas sudah terlampaui",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Tidak ada berkas terunggah",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Folder sementara tidak ditemukan",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Berkas hanya sebagian terunggah",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Berkas dengan nama sama sudah ada",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Ukuran berkas melebihi upload_max_filesize (direktif php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Ekstensi berkas yang diunggah tidak diijinkan",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Ukuran berkas terlalu besar",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Ukuran berkas terlalu kecil",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Berkas yang diunggah melebihi batas ukuran berkas",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Terunggah",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Gagal menyimpan berkas",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Nilai diubah ke '%s' : %s",
     "UPDATEURL.CONFIRM": "Anda ingin mengubah URL ke:\n\n%s\/\n\nKlik OK untuk lanjut, atau klik Batal untuk tetap pada:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL sudah diubah ke\n'%s'",
-    "UploadField.ConfirmDelete": "Anda ingin menghapus berkas ini dari sistem berkas server?",
-    "UploadField.EMPTYRESULT": "Pengunggahan menghasilkan berkas kosong",
-    "UploadField.Editing": "Mengedit...",
-    "UploadField.HTML_MAXFILESIZE": "Ukuran berkas melebihi MAX_FILE_SIZE (direktif HTML form)",
-    "UploadField.INVALIDEXTENSION": "Ekstensi berkas tidak diijinkan",
-    "UploadField.LOADING": "Memuat...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Jumlah maksimal berkas sudah terlampaui",
-    "UploadField.NOFILEUPLOADED": "Tidak ada berkas terunggah",
-    "UploadField.NOTMPFOLDER": "Folder sementara tidak ditemukan",
-    "UploadField.ONLYPARTIALUPLOADED": "Berkas hanya sebagian terunggah",
-    "UploadField.OVERWRITEWARNING": "Berkas dengan nama sama sudah ada",
-    "UploadField.PHP_MAXFILESIZE": "Ukuran berkas melebihi upload_max_filesize (direktif php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "Ekstensi berkas yang diunggah tidak diijinkan",
-    "UploadField.TOOLARGE": "Ukuran berkas terlalu besar",
-    "UploadField.TOOSMALL": "Ukuran berkas terlalu kecil",
-    "UploadField.UPLOADEDBYTES": "Berkas yang diunggah melebihi batas ukuran berkas",
-    "UploadField.Uploaded": "Terunggah",
-    "UploadField.WRITEFAILED": "Gagal menyimpan berkas",
     "VALIDATOR.FIELDREQUIRED": "Anda wajib mengisi \"%s\"."
 }
\ No newline at end of file
diff --git a/client/lang/src/is.js b/client/lang/src/is.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/is.js
+++ b/client/lang/src/is.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/it.js b/client/lang/src/it.js
index 89d5ea01a..690ccae04 100644
--- a/client/lang/src/it.js
+++ b/client/lang/src/it.js
@@ -9,6 +9,24 @@
     "LOADING": "caricamento...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Il carattere '%s' non può essere utilizzato in questo campo",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Il tuo browser non è compatibile con l'interfaccia del CMS. Per favore, usare Internet Explorer 7+, Google Chrome 10+ o Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Si è sicuri di voler eliminare questo file dal filesystem del server?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "File caricato vuoto",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Modifica ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Il file supera MAX_FILE_SIZE (direttiva moduli HTML)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Estensione non consentita",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Caricamento ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Numero massimo di file superato",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Nessun file caricato",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Cartella temporanea assente",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Il file è stato caricato solo parzialmente",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Un file con lo stesso nome esiste già",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Il file supera upload_max_filesize (direttiva php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Caricamento del file interrotto dall'estensione",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "La dimensione del file è troppo grande",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "La dimensione del file è troppo piccola",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Il numero di byte caricati supera la dimensione del file",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Caricato",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Scrittura del file su disco fallita",
     "SilverStripe\\Assets\\File.DRAFT": "Bozza",
     "SilverStripe\\Assets\\File.MODIFIED": "Modificato",
     "SilverStripe\\Assets\\File.PUBLISHED": "Pubblicato",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Cambiare il valore di '%s': %s",
     "UPDATEURL.CONFIRM": "Volete cambiare l'URL in:\n\n%s\/\n\nClicca OK per cambiare l'URL, clicca Annuler per lasciarla a:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "L'URL è stato cambiato in\n'%s'",
-    "UploadField.ConfirmDelete": "Si è sicuri di voler eliminare questo file dal filesystem del server?",
-    "UploadField.EMPTYRESULT": "File caricato vuoto",
-    "UploadField.Editing": "Modifica ...",
-    "UploadField.HTML_MAXFILESIZE": "Il file supera MAX_FILE_SIZE (direttiva moduli HTML)",
-    "UploadField.INVALIDEXTENSION": "Estensione non consentita",
-    "UploadField.LOADING": "Caricamento ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Numero massimo di file superato",
-    "UploadField.NOFILEUPLOADED": "Nessun file caricato",
-    "UploadField.NOTMPFOLDER": "Cartella temporanea assente",
-    "UploadField.ONLYPARTIALUPLOADED": "Il file è stato caricato solo parzialmente",
-    "UploadField.OVERWRITEWARNING": "Un file con lo stesso nome esiste già",
-    "UploadField.PHP_MAXFILESIZE": "Il file supera upload_max_filesize (direttiva php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "Caricamento del file interrotto dall'estensione",
-    "UploadField.TOOLARGE": "La dimensione del file è troppo grande",
-    "UploadField.TOOSMALL": "La dimensione del file è troppo piccola",
-    "UploadField.UPLOADEDBYTES": "Il numero di byte caricati supera la dimensione del file",
-    "UploadField.Uploaded": "Caricato",
-    "UploadField.WRITEFAILED": "Scrittura del file su disco fallita",
     "VALIDATOR.FIELDREQUIRED": "Completare il campo \"%s\", che è obbligatorio."
 }
\ No newline at end of file
diff --git a/client/lang/src/it_IT.js b/client/lang/src/it_IT.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/it_IT.js
+++ b/client/lang/src/it_IT.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/ja.js b/client/lang/src/ja.js
index 9f4c02072..5b9150255 100644
--- a/client/lang/src/ja.js
+++ b/client/lang/src/ja.js
@@ -9,6 +9,24 @@
     "LOADING": "読み込み中...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "文字'%s'はこのフィールドでは利用することができません．",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "ご利用のブラウザはCMSのインターフェイスと互換性がありません．Internet Explorer 7以上, Google Chrome 10以上またはMozilla Firefox 3.5以上をご利用ください",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "サーバーのファイルシステムからこのファイルを本当に削除しても良いですか?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "編集中...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "MAX_FILE_SIZE(最大ファイルサイズ)をファイルが超えています．(HTMLフォームで指定されています)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "拡張子は許可されていません．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "読み込み中...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "ファイルの最大数を超えました．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "ファイルはアップロードされませんでした．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "一時フォルダがありません．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "ファイルは部分的にアップロードされました．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "このファイル名はすでに存在します",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "upload_max_filesize(最大アップロードファイルサイズ)をファイルが超えています．(php.iniで指定されています)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "拡張子によりファイルアップロードが停止しました．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "ファイルサイズが大きすぎます．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "ファイルサイズが小さすぎます．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "アップロードされたバイトはファイルサイズを超えました．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "アップロードしました．",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "ディスクへのファイル書き込みに失敗しました．",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "'%s'へ値を変更しました : %s",
     "UPDATEURL.CONFIRM": "URLを次へ変更しますか?:\n\n%s\/\n\nOKをクリックするとURLが変更されます．キャンセルをクリックするとURLは保持されます:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URLは次へ変更されました\n\"%s\"",
-    "UploadField.ConfirmDelete": "サーバーのファイルシステムからこのファイルを本当に削除しても良いですか?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "編集中...",
-    "UploadField.HTML_MAXFILESIZE": "MAX_FILE_SIZE(最大ファイルサイズ)をファイルが超えています．(HTMLフォームで指定されています)",
-    "UploadField.INVALIDEXTENSION": "拡張子は許可されていません．",
-    "UploadField.LOADING": "読み込み中...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "ファイルの最大数を超えました．",
-    "UploadField.NOFILEUPLOADED": "ファイルはアップロードされませんでした．",
-    "UploadField.NOTMPFOLDER": "一時フォルダがありません．",
-    "UploadField.ONLYPARTIALUPLOADED": "ファイルは部分的にアップロードされました．",
-    "UploadField.OVERWRITEWARNING": "このファイル名はすでに存在します",
-    "UploadField.PHP_MAXFILESIZE": "upload_max_filesize(最大アップロードファイルサイズ)をファイルが超えています．(php.iniで指定されています)",
-    "UploadField.STOPEDBYEXTENSION": "拡張子によりファイルアップロードが停止しました．",
-    "UploadField.TOOLARGE": "ファイルサイズが大きすぎます．",
-    "UploadField.TOOSMALL": "ファイルサイズが小さすぎます．",
-    "UploadField.UPLOADEDBYTES": "アップロードされたバイトはファイルサイズを超えました．",
-    "UploadField.Uploaded": "アップロードしました．",
-    "UploadField.WRITEFAILED": "ディスクへのファイル書き込みに失敗しました．",
     "VALIDATOR.FIELDREQUIRED": "\"%s\"を入力してください，必須項目です．"
 }
\ No newline at end of file
diff --git a/client/lang/src/ja_JP.js b/client/lang/src/ja_JP.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/ja_JP.js
+++ b/client/lang/src/ja_JP.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/km.js b/client/lang/src/km.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/km.js
+++ b/client/lang/src/km.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/ko.js b/client/lang/src/ko.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/ko.js
+++ b/client/lang/src/ko.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/lt.js b/client/lang/src/lt.js
index 73332d4a6..f823798a1 100644
--- a/client/lang/src/lt.js
+++ b/client/lang/src/lt.js
@@ -9,6 +9,24 @@
     "LOADING": "įkeliama...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Šiame lauke negalima įvesti šio simbolio '%s'",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Jūsų naršyklė nesuderinama su TVS aplinka. Prašome naudoti Internet Explorer 7+, Google Chrome 10+ arba Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Ar tikrai norite pašalinti šią bylą iš serverio?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Nepavyko nieko įkelti",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Redaguojama ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Byla viršija MAX_FILE_SIZE (HTML formos nustatymai)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Bylos plėtinys neleidžiamas",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Įkeliama ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Viršytas bylų kiekis",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Jokia byla neįkelta",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Nerastas laikinų bylų katalogas",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Byla įkelta tik dalinai",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Byla su tokiu pavadinimu jau yra",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Byla viršija upload_max_filesize (php.ini nustatymai)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Bylos įkėlimas sustabytas dėl bylos plėtinio",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Byla per didelė",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Byla per maža",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Įkeltas turinys viršijo bylos dydį",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Įkelta",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Nepavyko įrašyti į diską",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Pakeista reikšmė į '%s' : %s",
     "UPDATEURL.CONFIRM": "Ar tikrai norite pakeisti URL dalį į:\n\n%s\/\n\nSpauskite OK, jeigu norite pakeisti arba Cancel, jeigu norite palikti kaip yra:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL dalis pakeista į:\n'%s'",
-    "UploadField.ConfirmDelete": "Ar tikrai norite pašalinti šią bylą iš serverio?",
-    "UploadField.EMPTYRESULT": "Nepavyko nieko įkelti",
-    "UploadField.Editing": "Redaguojama ...",
-    "UploadField.HTML_MAXFILESIZE": "Byla viršija MAX_FILE_SIZE (HTML formos nustatymai)",
-    "UploadField.INVALIDEXTENSION": "Bylos plėtinys neleidžiamas",
-    "UploadField.LOADING": "Įkeliama ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Viršytas bylų kiekis",
-    "UploadField.NOFILEUPLOADED": "Jokia byla neįkelta",
-    "UploadField.NOTMPFOLDER": "Nerastas laikinų bylų katalogas",
-    "UploadField.ONLYPARTIALUPLOADED": "Byla įkelta tik dalinai",
-    "UploadField.OVERWRITEWARNING": "Byla su tokiu pavadinimu jau yra",
-    "UploadField.PHP_MAXFILESIZE": "Byla viršija upload_max_filesize (php.ini nustatymai)",
-    "UploadField.STOPEDBYEXTENSION": "Bylos įkėlimas sustabytas dėl bylos plėtinio",
-    "UploadField.TOOLARGE": "Byla per didelė",
-    "UploadField.TOOSMALL": "Byla per maža",
-    "UploadField.UPLOADEDBYTES": "Įkeltas turinys viršijo bylos dydį",
-    "UploadField.Uploaded": "Įkelta",
-    "UploadField.WRITEFAILED": "Nepavyko įrašyti į diską",
     "VALIDATOR.FIELDREQUIRED": "Prašome užpildyti \"%s\", jis yra privalomas."
 }
\ No newline at end of file
diff --git a/client/lang/src/lt_LT.js b/client/lang/src/lt_LT.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/lt_LT.js
+++ b/client/lang/src/lt_LT.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/lv.js b/client/lang/src/lv.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/lv.js
+++ b/client/lang/src/lv.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/mi.js b/client/lang/src/mi.js
index 57fcb5fb3..543731bff 100644
--- a/client/lang/src/mi.js
+++ b/client/lang/src/mi.js
@@ -9,6 +9,24 @@
     "LOADING": "Uta ana...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Kāore e taea te whakamahi i te pūāhua '%s' i tēnei āpure",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Kāore tō pūtirotiro i te hototahi ki te atanga CMS. Whakamahia Internet Explorer 7+, Google Chrome 10+, Mozilla Firefox 3.5+ rānei.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "He tika tonu kia tangohia tēnei kōnae i te pūnahakōnae tūmau?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Otinga tukuatu kōnae piako",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Whakatika ana ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Kua hipa te mōrahi_rahi_kōnae i te kōnae (whakaritenga puka HTML)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Kāore te toronga i te whakaaetia",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Uta ana...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Kua hipa te mōrahi kōnae",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Kāore he Kōnae i tukuna atu",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Kua ngaro tētahi kōpaki rangitahi",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Kua tukuna atu he wāhanga anake o te kōnae",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Kei te tīari kē tētahi kōnae me te ingoa ōrite",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Kua hipa te mōrahi_rahikōnae_tukuatu i te kōnae (whakaritenga php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "I whakamutua te tukuatu kōnae e te toronga",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "He rahi rawa te rahikōnae",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "He iti rawa te rahikōnae",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Kua hipa te rahi kōnae i ngā paita kua tukuna atu",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Kua tukuna atu",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "I rahua te tuhi kōnae ki te kōpae",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "I hurihia te uara ki te '%s' : %s",
     "UPDATEURL.CONFIRM": "Kei te hiahia koe kia huri au i te PRO ki:\n\n%s\/\n\nPāwhiri Āe kia hurihia te PRO, pāwhiri Whakakore kia waiho:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "Kua hurihia te PRO ki \n\"%s\"",
-    "UploadField.ConfirmDelete": "He tika tonu kia tangohia tēnei kōnae i te pūnahakōnae tūmau?",
-    "UploadField.EMPTYRESULT": "Otinga tukuatu kōnae piako",
-    "UploadField.Editing": "Whakatika ana ...",
-    "UploadField.HTML_MAXFILESIZE": "Kua hipa te mōrahi_rahi_kōnae i te kōnae (whakaritenga puka HTML)",
-    "UploadField.INVALIDEXTENSION": "Kāore te toronga i te whakaaetia",
-    "UploadField.LOADING": "Uta ana...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Kua hipa te mōrahi kōnae",
-    "UploadField.NOFILEUPLOADED": "Kāore he Kōnae i tukuna atu",
-    "UploadField.NOTMPFOLDER": "Kua ngaro tētahi kōpaki rangitahi",
-    "UploadField.ONLYPARTIALUPLOADED": "Kua tukuna atu he wāhanga anake o te kōnae",
-    "UploadField.OVERWRITEWARNING": "Kei te tīari kē tētahi kōnae me te ingoa ōrite",
-    "UploadField.PHP_MAXFILESIZE": "Kua hipa te mōrahi_rahikōnae_tukuatu i te kōnae (whakaritenga php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "I whakamutua te tukuatu kōnae e te toronga",
-    "UploadField.TOOLARGE": "He rahi rawa te rahikōnae",
-    "UploadField.TOOSMALL": "He iti rawa te rahikōnae",
-    "UploadField.UPLOADEDBYTES": "Kua hipa te rahi kōnae i ngā paita kua tukuna atu",
-    "UploadField.Uploaded": "Kua tukuna atu",
-    "UploadField.WRITEFAILED": "I rahua te tuhi kōnae ki te kōpae",
     "VALIDATOR.FIELDREQUIRED": "Whakakīa \"%s\", he whakaritenga tēnei."
 }
\ No newline at end of file
diff --git a/client/lang/src/ms.js b/client/lang/src/ms.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/ms.js
+++ b/client/lang/src/ms.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/my.js b/client/lang/src/my.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/my.js
+++ b/client/lang/src/my.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/nb.js b/client/lang/src/nb.js
index 511b14151..213d64c89 100644
--- a/client/lang/src/nb.js
+++ b/client/lang/src/nb.js
@@ -9,6 +9,24 @@
     "LOADING": "laster ...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Tegnet '%s' kan ikke brukes i dette feltet",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Nettleseren din er ikke kompatibel med publiseringsgrensesnittet. Vennligst bruk Internet Explorer 7+, Google Chrome 10+ eller Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Er du sikker på at du vil fjerne denne filen fra serverens filsystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Filopplastingen ga et tomt resultat",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Redigerer ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Filen er større enn MAX_FILE_SIZE (HTML-direktiv)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Filtypen er ikke tillatt",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Laster ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "For mange filer",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Ingen filer ble lastet opp",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Mangler en midlertidig mappe",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Filen ble bare delvis lastet opp",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "En fil med samme navn eksisterer allerede",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Filen er større enn upload_max_filesize (innstilling i php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Filopplastingen ble stoppet av en utvidelse",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filen er for stor",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filen er for liten",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Lastet opp flere bytes enn filstørrelsen tilsier",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Lastet opp",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Klarte ikke å lagre filen på harddisken",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Endret verdien til '%s': %s",
     "UPDATEURL.CONFIRM": "Ønsker du å endre adressen til:\n\n%s\/\n\nTrykk Ok for å endre adressen, trykk Avbryt for å beholde den som:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "Adressen har blitt endret til\n'%s'",
-    "UploadField.ConfirmDelete": "Er du sikker på at du vil fjerne denne filen fra serverens filsystem?",
-    "UploadField.EMPTYRESULT": "Filopplastingen ga et tomt resultat",
-    "UploadField.Editing": "Redigerer ...",
-    "UploadField.HTML_MAXFILESIZE": "Filen er større enn MAX_FILE_SIZE (HTML-direktiv)",
-    "UploadField.INVALIDEXTENSION": "Filtypen er ikke tillatt",
-    "UploadField.LOADING": "Laster ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "For mange filer",
-    "UploadField.NOFILEUPLOADED": "Ingen filer ble lastet opp",
-    "UploadField.NOTMPFOLDER": "Mangler en midlertidig mappe",
-    "UploadField.ONLYPARTIALUPLOADED": "Filen ble bare delvis lastet opp",
-    "UploadField.OVERWRITEWARNING": "En fil med samme navn eksisterer allerede",
-    "UploadField.PHP_MAXFILESIZE": "Filen er større enn upload_max_filesize (innstilling i php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "Filopplastingen ble stoppet av en utvidelse",
-    "UploadField.TOOLARGE": "Filen er for stor",
-    "UploadField.TOOSMALL": "Filen er for liten",
-    "UploadField.UPLOADEDBYTES": "Lastet opp flere bytes enn filstørrelsen tilsier",
-    "UploadField.Uploaded": "Lastet opp",
-    "UploadField.WRITEFAILED": "Klarte ikke å lagre filen på harddisken",
     "VALIDATOR.FIELDREQUIRED": "Vennligst fyll ut det påkrevde feltet \"%s\""
 }
\ No newline at end of file
diff --git a/client/lang/src/nb_NO.js b/client/lang/src/nb_NO.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/nb_NO.js
+++ b/client/lang/src/nb_NO.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/ne.js b/client/lang/src/ne.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/ne.js
+++ b/client/lang/src/ne.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/nl.js b/client/lang/src/nl.js
index 9fb2e3ea8..f8197e87c 100644
--- a/client/lang/src/nl.js
+++ b/client/lang/src/nl.js
@@ -9,6 +9,24 @@
     "LOADING": "laden...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Het karakter \"%s\" mag niet gebruikt worden in dit veld",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Uw huidige browser is niet compatibel met dit CMS. Gebruik één van deze browsers: Internet Explorer 7+, Google Chrome 10+ of Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Weet u zeker dat u dit bestand wilt verwijderen van de server?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Leeg bestand geüpload",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Bijwerken...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Bestand is groter dan MAX_FILE_SIZE (limiet in HTML formulier)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extensie is niet toegestaan",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Laden...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Maximaal aantal bestanden overschreden",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Er is geen bestand geüpload",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Mist een tijdelijke map",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Bestand is maar gedeeltelijk geüpload",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Bestand met dezelfde naam bestaat al",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Bestand is groter dan upload_max_filesize (limiet in php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Bestandsupload gestopt door extensie",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Bestand is te groot",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Bestand is te klein",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Geüploade bytes overschrijden bestandsgrootte",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Geüpload",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Kan bestand niet naar schijf schrijven",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Waarde gewijzigd naar \"%s\" : %s",
     "UPDATEURL.CONFIRM": "Wilt u de URL wijzigen naar:\n\n%s\/\n\nKlik Ok om de URL te wijzigen, of klik Annuleren om het te laten zoals volgt:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "De URL is veranderd naar \n\"%s\"",
-    "UploadField.ConfirmDelete": "Weet u zeker dat u dit bestand wilt verwijderen van de server?",
-    "UploadField.EMPTYRESULT": "Leeg bestand geüpload",
-    "UploadField.Editing": "Bijwerken...",
-    "UploadField.HTML_MAXFILESIZE": "Bestand is groter dan MAX_FILE_SIZE (limiet in HTML formulier)",
-    "UploadField.INVALIDEXTENSION": "Extensie is niet toegestaan",
-    "UploadField.LOADING": "Laden...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Maximaal aantal bestanden overschreden",
-    "UploadField.NOFILEUPLOADED": "Er is geen bestand geüpload",
-    "UploadField.NOTMPFOLDER": "Mist een tijdelijke map",
-    "UploadField.ONLYPARTIALUPLOADED": "Bestand is maar gedeeltelijk geüpload",
-    "UploadField.OVERWRITEWARNING": "Bestand met dezelfde naam bestaat al",
-    "UploadField.PHP_MAXFILESIZE": "Bestand is groter dan upload_max_filesize (limiet in php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "Bestandsupload gestopt door extensie",
-    "UploadField.TOOLARGE": "Bestand is te groot",
-    "UploadField.TOOSMALL": "Bestand is te klein",
-    "UploadField.UPLOADEDBYTES": "Geüploade bytes overschrijden bestandsgrootte",
-    "UploadField.Uploaded": "Geüpload",
-    "UploadField.WRITEFAILED": "Kan bestand niet naar schijf schrijven",
     "VALIDATOR.FIELDREQUIRED": "Vul \"%s\" in, dit is een verplicht veld."
 }
\ No newline at end of file
diff --git a/client/lang/src/nl_NL.js b/client/lang/src/nl_NL.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/nl_NL.js
+++ b/client/lang/src/nl_NL.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/pa.js b/client/lang/src/pa.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/pa.js
+++ b/client/lang/src/pa.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/pl.js b/client/lang/src/pl.js
index d78b3d3b3..a885d3096 100644
--- a/client/lang/src/pl.js
+++ b/client/lang/src/pl.js
@@ -9,6 +9,24 @@
     "LOADING": "wczytywanie...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Symbol '%s' jest niedozwolony dla tego pola",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Twoja przeglądarka nie jest kompatybilna z tym CMS-em. Użyj Internet Explorera 7+, Google Chrome 10+ lub Mozilli Firefoxa 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Czy na pewno chcesz usunąć ten plik z systemu plików na serwerze?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Wysyłka zwróciła pusty wynik",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Edycja trwa...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Wielkość pliku przekracza MAX_FILE_SIZE (atrybut formularza HTML)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Niedozwolone rozszerzenie",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Wczytywanie...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Przekroczono dozwoloną liczbę plików",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Brak pliku podczas wysyłki",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Brak katalogu tymczasowego",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Wysłano tylko część pliku",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Plik o tej samej nazwie już istnieje",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Rozmiar pliku przekracza upload_max_filesize (dyrektywa php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Wysyłka pliku wstrzymana przez rozszerzenie",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Zbyt duży rozmiar pliku",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Zbyt mały rozmiar pliku",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Wysłana liczba bajtów przekracza wielkość pliku",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Wysyłka ukończona",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Zapis pliku na dysk nie powiódł się",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Zmieniono wartość na '%s' : %s",
     "UPDATEURL.CONFIRM": "Czy na pewno zmienić URL na:\n\n%s\/\n\nWciśnij OK aby zmienić URL, wciśnij Anuluj aby pozostawić jako:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL został zmieniony na:\n'%s'",
-    "UploadField.ConfirmDelete": "Czy na pewno chcesz usunąć ten plik z systemu plików na serwerze?",
-    "UploadField.EMPTYRESULT": "Wysyłka zwróciła pusty wynik",
-    "UploadField.Editing": "Edycja trwa...",
-    "UploadField.HTML_MAXFILESIZE": "Wielkość pliku przekracza MAX_FILE_SIZE (atrybut formularza HTML)",
-    "UploadField.INVALIDEXTENSION": "Niedozwolone rozszerzenie",
-    "UploadField.LOADING": "Wczytywanie...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Przekroczono dozwoloną liczbę plików",
-    "UploadField.NOFILEUPLOADED": "Brak pliku podczas wysyłki",
-    "UploadField.NOTMPFOLDER": "Brak katalogu tymczasowego",
-    "UploadField.ONLYPARTIALUPLOADED": "Wysłano tylko część pliku",
-    "UploadField.OVERWRITEWARNING": "Plik o tej samej nazwie już istnieje",
-    "UploadField.PHP_MAXFILESIZE": "Rozmiar pliku przekracza upload_max_filesize (dyrektywa php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "Wysyłka pliku wstrzymana przez rozszerzenie",
-    "UploadField.TOOLARGE": "Zbyt duży rozmiar pliku",
-    "UploadField.TOOSMALL": "Zbyt mały rozmiar pliku",
-    "UploadField.UPLOADEDBYTES": "Wysłana liczba bajtów przekracza wielkość pliku",
-    "UploadField.Uploaded": "Wysyłka ukończona",
-    "UploadField.WRITEFAILED": "Zapis pliku na dysk nie powiódł się",
     "VALIDATOR.FIELDREQUIRED": "Wypełnij wymagane pole \"%s\"."
 }
\ No newline at end of file
diff --git a/client/lang/src/pl_PL.js b/client/lang/src/pl_PL.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/pl_PL.js
+++ b/client/lang/src/pl_PL.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/pt.js b/client/lang/src/pt.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/pt.js
+++ b/client/lang/src/pt.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/pt_BR.js b/client/lang/src/pt_BR.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/pt_BR.js
+++ b/client/lang/src/pt_BR.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/pt_PT.js b/client/lang/src/pt_PT.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/pt_PT.js
+++ b/client/lang/src/pt_PT.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/ro.js b/client/lang/src/ro.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/ro.js
+++ b/client/lang/src/ro.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/ro_RO.js b/client/lang/src/ro_RO.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/ro_RO.js
+++ b/client/lang/src/ro_RO.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/ru.js b/client/lang/src/ru.js
index 3c2646e96..bb2c7fbb8 100644
--- a/client/lang/src/ru.js
+++ b/client/lang/src/ru.js
@@ -9,6 +9,24 @@
     "LOADING": "загрузка...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Кодировка '%s' не может быть использована для этого поля",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Ваш бразуер не совместим с интерфейсом CMS. Пожалуйста, используйте следующие браузеры: Internet Explorer 7+, Google Chrome 10+ или Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Вы действительно хотите удалить этот файл?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Загружен пустой файл",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Изменение ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Размер файла превышает значение MAX_FILE_SIZE (атрибут HTML формы)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Недопустимое расширение файла",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Загрузка ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Превышено допустимое число файлов",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Файл не был загуржен",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Не найдена временная директория",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Файл был загружен частично",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Файл с таким именем уже существует.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Размер файла превышает значение upload_max_filesize (настройка php.ini)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Загрузка файла прервана расширением",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Слишком большой размер файла",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Слишком маленький размер файла",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Превышен допустимый размер файла",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Загружено",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Не удалось записать файл на диск",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Значение изменено на '%s' : %s",
     "UPDATEURL.CONFIRM": "Вы хотите изменить адрес на:\n\n%s\/?\n\nНажмите Ок для изменения адреса или Отмена, чтобы оставить адрес:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "Адрес был изменён на\n'%s'",
-    "UploadField.ConfirmDelete": "Вы действительно хотите удалить этот файл?",
-    "UploadField.EMPTYRESULT": "Загружен пустой файл",
-    "UploadField.Editing": "Изменение ...",
-    "UploadField.HTML_MAXFILESIZE": "Размер файла превышает значение MAX_FILE_SIZE (атрибут HTML формы)",
-    "UploadField.INVALIDEXTENSION": "Недопустимое расширение файла",
-    "UploadField.LOADING": "Загрузка ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Превышено допустимое число файлов",
-    "UploadField.NOFILEUPLOADED": "Файл не был загуржен",
-    "UploadField.NOTMPFOLDER": "Не найдена временная директория",
-    "UploadField.ONLYPARTIALUPLOADED": "Файл был загружен частично",
-    "UploadField.OVERWRITEWARNING": "Файл с таким именем уже существует.",
-    "UploadField.PHP_MAXFILESIZE": "Размер файла превышает значение upload_max_filesize (настройка php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "Загрузка файла прервана расширением",
-    "UploadField.TOOLARGE": "Слишком большой размер файла",
-    "UploadField.TOOSMALL": "Слишком маленький размер файла",
-    "UploadField.UPLOADEDBYTES": "Превышен допустимый размер файла",
-    "UploadField.Uploaded": "Загружено",
-    "UploadField.WRITEFAILED": "Не удалось записать файл на диск",
     "VALIDATOR.FIELDREQUIRED": "Необходимо заполнить обязательное поле \"%s\"."
 }
\ No newline at end of file
diff --git a/client/lang/src/si.js b/client/lang/src/si.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/si.js
+++ b/client/lang/src/si.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/sk.js b/client/lang/src/sk.js
index 2d4018da8..327e12c2d 100644
--- a/client/lang/src/sk.js
+++ b/client/lang/src/sk.js
@@ -9,6 +9,24 @@
     "LOADING": "natahovanie...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "V tomto poli znak '%s' nesmie byť použité",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Váš prehliadač nie je kompatibilný s CMS prostredím. Prosím požite Internet Explorer 7+, Google Chrome 10+alebo Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Určite chcete odstrániť tento súbor zo serverového súborového systému?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Výsledok nahrania pázdny súbor",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editovanie ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Súbor prekročil MAX_FILE_SIZE (HTML formulár direktíva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extenzia nie je povolená",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Nahrávanie ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Maximálny počet súborov bol prekročený",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Súbor nebol nahratý",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Chýbajúci dočasný priečinok",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Súbor bol iba čiastočne nahratý",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Súbor s rovnakým názvom už existuje",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Súbor prekročil upload_max_filesize (php.ini direktíva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Nahratie súboru bolo zastavené pre extenziu",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Veľkosť súboru je veľmi veľká",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Veľkosť súboru je veľmi malá",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Nahrané bytz prkročili veľkosť súboru",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Nahraté",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Chyba zápisu súboru na disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Hodnota bola zmenená na '%s' : %s",
     "UPDATEURL.CONFIRM": "Chceli by ste zmeniť URL na:\n\n%s\n\nKliknite OK pre zmenu URL, kliknite Cancel pre ponechanie pôvodného:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL bolo zmenené na\n'%s'",
-    "UploadField.ConfirmDelete": "Určite chcete odstrániť tento súbor zo serverového súborového systému?",
-    "UploadField.EMPTYRESULT": "Výsledok nahrania pázdny súbor",
-    "UploadField.Editing": "Editovanie ...",
-    "UploadField.HTML_MAXFILESIZE": "Súbor prekročil MAX_FILE_SIZE (HTML formulár direktíva)",
-    "UploadField.INVALIDEXTENSION": "Extenzia nie je povolená",
-    "UploadField.LOADING": "Nahrávanie ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Maximálny počet súborov bol prekročený",
-    "UploadField.NOFILEUPLOADED": "Súbor nebol nahratý",
-    "UploadField.NOTMPFOLDER": "Chýbajúci dočasný priečinok",
-    "UploadField.ONLYPARTIALUPLOADED": "Súbor bol iba čiastočne nahratý",
-    "UploadField.OVERWRITEWARNING": "Súbor s rovnakým názvom už existuje",
-    "UploadField.PHP_MAXFILESIZE": "Súbor prekročil upload_max_filesize (php.ini direktíva)",
-    "UploadField.STOPEDBYEXTENSION": "Nahratie súboru bolo zastavené pre extenziu",
-    "UploadField.TOOLARGE": "Veľkosť súboru je veľmi veľká",
-    "UploadField.TOOSMALL": "Veľkosť súboru je veľmi malá",
-    "UploadField.UPLOADEDBYTES": "Nahrané bytz prkročili veľkosť súboru",
-    "UploadField.Uploaded": "Nahraté",
-    "UploadField.WRITEFAILED": "Chyba zápisu súboru na disk",
     "VALIDATOR.FIELDREQUIRED": "Vyplňte \"%s\", prosím, je požadované."
 }
\ No newline at end of file
diff --git a/client/lang/src/sk_SK.js b/client/lang/src/sk_SK.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/sk_SK.js
+++ b/client/lang/src/sk_SK.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/sl.js b/client/lang/src/sl.js
index be1fe63ef..facf64f65 100644
--- a/client/lang/src/sl.js
+++ b/client/lang/src/sl.js
@@ -9,6 +9,24 @@
     "LOADING": "nalagam ...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Znak '%s' ne more biti uporabljen v tem polju",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Izbrišem datoteko iz datotečnega sistema strežnika?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Urejanje ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Datoteka presega največjo dovoljeno velikost \"MAX_FILE_SIZE\" (HTML direktiva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Razširitev ni dovoljena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Nalaganje ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Preseženo največje število datotek",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Nobena datoteka ni bila naložena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Manjka začasna mapa",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Datoteka je bila le delno naložena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Datoteka z enakim imenom že obstaja",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Datoteka presega največjo dovoljeno velikost \"upload_max_filesize\" (php.ini direktiva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Nalaganje datoteke je ustavila razširitev",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Datoteka je prevelika",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Datoteka je premajhna",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Naloženi bajti presegajo velikost datoteke",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Naloženo",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Neuspešno pisanje datoteke na disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Spremenjena vrednost '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL je bil spremenjen v \n'%s'",
-    "UploadField.ConfirmDelete": "Izbrišem datoteko iz datotečnega sistema strežnika?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Urejanje ...",
-    "UploadField.HTML_MAXFILESIZE": "Datoteka presega največjo dovoljeno velikost \"MAX_FILE_SIZE\" (HTML direktiva)",
-    "UploadField.INVALIDEXTENSION": "Razširitev ni dovoljena",
-    "UploadField.LOADING": "Nalaganje ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Preseženo največje število datotek",
-    "UploadField.NOFILEUPLOADED": "Nobena datoteka ni bila naložena",
-    "UploadField.NOTMPFOLDER": "Manjka začasna mapa",
-    "UploadField.ONLYPARTIALUPLOADED": "Datoteka je bila le delno naložena",
-    "UploadField.OVERWRITEWARNING": "Datoteka z enakim imenom že obstaja",
-    "UploadField.PHP_MAXFILESIZE": "Datoteka presega največjo dovoljeno velikost \"upload_max_filesize\" (php.ini direktiva)",
-    "UploadField.STOPEDBYEXTENSION": "Nalaganje datoteke je ustavila razširitev",
-    "UploadField.TOOLARGE": "Datoteka je prevelika",
-    "UploadField.TOOSMALL": "Datoteka je premajhna",
-    "UploadField.UPLOADEDBYTES": "Naloženi bajti presegajo velikost datoteke",
-    "UploadField.Uploaded": "Naloženo",
-    "UploadField.WRITEFAILED": "Neuspešno pisanje datoteke na disk",
     "VALIDATOR.FIELDREQUIRED": "Prosimo izpolnite \"%s\", to je zahtevano"
 }
\ No newline at end of file
diff --git a/client/lang/src/sl_SI.js b/client/lang/src/sl_SI.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/sl_SI.js
+++ b/client/lang/src/sl_SI.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/sr.js b/client/lang/src/sr.js
index 21ea77385..8912c0644 100644
--- a/client/lang/src/sr.js
+++ b/client/lang/src/sr.js
@@ -9,6 +9,24 @@
     "LOADING": "Учитавање...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Знак '%s' не можете користити у овом пољу",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Ваш веб прегледач није компатибилан са интерфејсом CMS-а. Молимо Вас да користите Internet Explorer 7+, Google Chrome 10+ или Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Да ли сте сигурни да желите да избришете ову датотеку са датотечког система сервера?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Резултат постављања је празна датотека",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Уређивање...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Датотека премашује MAX_FILE_SIZE (HTML директива образаца)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Екстензија није дозвољена",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Учитавање...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Максималан број датотека је премашен",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Ни једна датотека није постављена",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Недостаје привремена фасцикла",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Датотека је само делимично постављена",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Датотека са истим именом већ постоји",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Датотека премашује upload_max_filesize (php.ini директива)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Постављање датотеке је зауставњено за екстензију",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Датотека је превелика",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Датотека је премала",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Постављени бајтови премашују величину датотеке",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Постављено",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Уписивање датотеке на диск није успело",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Промењена вредност на '%s' : %s",
     "UPDATEURL.CONFIRM": "Да ли желите да променим URL на:\n\n\n%s\/\n\nКликни на У реду да би URL био промењен, кликни на Одустани да би остало:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL је промењен на\n'%s'",
-    "UploadField.ConfirmDelete": "Да ли сте сигурни да желите да избришете ову датотеку са датотечког система сервера?",
-    "UploadField.EMPTYRESULT": "Резултат постављања је празна датотека",
-    "UploadField.Editing": "Уређивање...",
-    "UploadField.HTML_MAXFILESIZE": "Датотека премашује MAX_FILE_SIZE (HTML директива образаца)",
-    "UploadField.INVALIDEXTENSION": "Екстензија није дозвољена",
-    "UploadField.LOADING": "Учитавање...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Максималан број датотека је премашен",
-    "UploadField.NOFILEUPLOADED": "Ни једна датотека није постављена",
-    "UploadField.NOTMPFOLDER": "Недостаје привремена фасцикла",
-    "UploadField.ONLYPARTIALUPLOADED": "Датотека је само делимично постављена",
-    "UploadField.OVERWRITEWARNING": "Датотека са истим именом већ постоји",
-    "UploadField.PHP_MAXFILESIZE": "Датотека премашује upload_max_filesize (php.ini директива)",
-    "UploadField.STOPEDBYEXTENSION": "Постављање датотеке је зауставњено за екстензију",
-    "UploadField.TOOLARGE": "Датотека је превелика",
-    "UploadField.TOOSMALL": "Датотека је премала",
-    "UploadField.UPLOADEDBYTES": "Постављени бајтови премашују величину датотеке",
-    "UploadField.Uploaded": "Постављено",
-    "UploadField.WRITEFAILED": "Уписивање датотеке на диск није успело",
     "VALIDATOR.FIELDREQUIRED": "Молимо Вас да попуните \"%s\", обавезно је."
 }
\ No newline at end of file
diff --git a/client/lang/src/sr@latin.js b/client/lang/src/sr@latin.js
index 92935bc91..338870945 100644
--- a/client/lang/src/sr@latin.js
+++ b/client/lang/src/sr@latin.js
@@ -9,6 +9,24 @@
     "LOADING": "Učitavanje...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Znak '%s' ne možete koristiti u ovom polju",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Vaš veb pregledač nije kompatibilan sa interfejsom CMS-a. Molimo Vas da koristite Internet Explorer 7+, Google Chrome 10+ ili Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Da li ste sigurni da želite da izbrišete ovu datoteku sa datotečkog sistema servera?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Rezultat postavljanja je prazna datoteka",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Uređivanje...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Datoteka premašuje MAX_FILE_SIZE (HTML direktiva obrazaca)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Ekstenzija nije dozvoljena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Učitavanje...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Maksimalan broj datoteka je premašen",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Ni jedna datoteka nije postavljena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Nedostaje privremena fascikla",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Datoteka je samo delimično postavljena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Datoteka sa istim imenom već postoji",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Datoteka premašuje upload_max_filesize (php.ini direktiva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Postavljanje datoteke je zaustavnjeno za ekstenziju",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Datoteka je prevelika",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Datoteka je premala",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Postavljeni bajtovi premašuju veličinu datoteke",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Postavljeno",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Upisivanje datoteke na disk nije uspelo",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Promenjena vrednost na '%s' : %s",
     "UPDATEURL.CONFIRM": "Da li želite da promenim URL na:\n\n\n%s\/\n\nKlikni na U redu da bi URL bio promenjen, klikni na Odustani da bi ostalo:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL je promenjen na\n'%s'",
-    "UploadField.ConfirmDelete": "Da li ste sigurni da želite da izbrišete ovu datoteku sa datotečkog sistema servera?",
-    "UploadField.EMPTYRESULT": "Rezultat postavljanja je prazna datoteka",
-    "UploadField.Editing": "Uređivanje...",
-    "UploadField.HTML_MAXFILESIZE": "Datoteka premašuje MAX_FILE_SIZE (HTML direktiva obrazaca)",
-    "UploadField.INVALIDEXTENSION": "Ekstenzija nije dozvoljena",
-    "UploadField.LOADING": "Učitavanje...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Maksimalan broj datoteka je premašen",
-    "UploadField.NOFILEUPLOADED": "Ni jedna datoteka nije postavljena",
-    "UploadField.NOTMPFOLDER": "Nedostaje privremena fascikla",
-    "UploadField.ONLYPARTIALUPLOADED": "Datoteka je samo delimično postavljena",
-    "UploadField.OVERWRITEWARNING": "Datoteka sa istim imenom već postoji",
-    "UploadField.PHP_MAXFILESIZE": "Datoteka premašuje upload_max_filesize (php.ini direktiva)",
-    "UploadField.STOPEDBYEXTENSION": "Postavljanje datoteke je zaustavnjeno za ekstenziju",
-    "UploadField.TOOLARGE": "Datoteka je prevelika",
-    "UploadField.TOOSMALL": "Datoteka je premala",
-    "UploadField.UPLOADEDBYTES": "Postavljeni bajtovi premašuju veličinu datoteke",
-    "UploadField.Uploaded": "Postavljeno",
-    "UploadField.WRITEFAILED": "Upisivanje datoteke na disk nije uspelo",
     "VALIDATOR.FIELDREQUIRED": "Molimo Vas da popunite \"%s\", obavezno je."
 }
\ No newline at end of file
diff --git a/client/lang/src/sr_RS.js b/client/lang/src/sr_RS.js
index 21ea77385..8912c0644 100644
--- a/client/lang/src/sr_RS.js
+++ b/client/lang/src/sr_RS.js
@@ -9,6 +9,24 @@
     "LOADING": "Учитавање...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Знак '%s' не можете користити у овом пољу",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Ваш веб прегледач није компатибилан са интерфејсом CMS-а. Молимо Вас да користите Internet Explorer 7+, Google Chrome 10+ или Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Да ли сте сигурни да желите да избришете ову датотеку са датотечког система сервера?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Резултат постављања је празна датотека",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Уређивање...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Датотека премашује MAX_FILE_SIZE (HTML директива образаца)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Екстензија није дозвољена",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Учитавање...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Максималан број датотека је премашен",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Ни једна датотека није постављена",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Недостаје привремена фасцикла",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Датотека је само делимично постављена",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Датотека са истим именом већ постоји",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Датотека премашује upload_max_filesize (php.ini директива)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Постављање датотеке је зауставњено за екстензију",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Датотека је превелика",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Датотека је премала",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Постављени бајтови премашују величину датотеке",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Постављено",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Уписивање датотеке на диск није успело",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Промењена вредност на '%s' : %s",
     "UPDATEURL.CONFIRM": "Да ли желите да променим URL на:\n\n\n%s\/\n\nКликни на У реду да би URL био промењен, кликни на Одустани да би остало:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL је промењен на\n'%s'",
-    "UploadField.ConfirmDelete": "Да ли сте сигурни да желите да избришете ову датотеку са датотечког система сервера?",
-    "UploadField.EMPTYRESULT": "Резултат постављања је празна датотека",
-    "UploadField.Editing": "Уређивање...",
-    "UploadField.HTML_MAXFILESIZE": "Датотека премашује MAX_FILE_SIZE (HTML директива образаца)",
-    "UploadField.INVALIDEXTENSION": "Екстензија није дозвољена",
-    "UploadField.LOADING": "Учитавање...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Максималан број датотека је премашен",
-    "UploadField.NOFILEUPLOADED": "Ни једна датотека није постављена",
-    "UploadField.NOTMPFOLDER": "Недостаје привремена фасцикла",
-    "UploadField.ONLYPARTIALUPLOADED": "Датотека је само делимично постављена",
-    "UploadField.OVERWRITEWARNING": "Датотека са истим именом већ постоји",
-    "UploadField.PHP_MAXFILESIZE": "Датотека премашује upload_max_filesize (php.ini директива)",
-    "UploadField.STOPEDBYEXTENSION": "Постављање датотеке је зауставњено за екстензију",
-    "UploadField.TOOLARGE": "Датотека је превелика",
-    "UploadField.TOOSMALL": "Датотека је премала",
-    "UploadField.UPLOADEDBYTES": "Постављени бајтови премашују величину датотеке",
-    "UploadField.Uploaded": "Постављено",
-    "UploadField.WRITEFAILED": "Уписивање датотеке на диск није успело",
     "VALIDATOR.FIELDREQUIRED": "Молимо Вас да попуните \"%s\", обавезно је."
 }
\ No newline at end of file
diff --git a/client/lang/src/sr_RS@latin.js b/client/lang/src/sr_RS@latin.js
index 92935bc91..338870945 100644
--- a/client/lang/src/sr_RS@latin.js
+++ b/client/lang/src/sr_RS@latin.js
@@ -9,6 +9,24 @@
     "LOADING": "Učitavanje...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Znak '%s' ne možete koristiti u ovom polju",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Vaš veb pregledač nije kompatibilan sa interfejsom CMS-a. Molimo Vas da koristite Internet Explorer 7+, Google Chrome 10+ ili Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Da li ste sigurni da želite da izbrišete ovu datoteku sa datotečkog sistema servera?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Rezultat postavljanja je prazna datoteka",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Uređivanje...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Datoteka premašuje MAX_FILE_SIZE (HTML direktiva obrazaca)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Ekstenzija nije dozvoljena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Učitavanje...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Maksimalan broj datoteka je premašen",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Ni jedna datoteka nije postavljena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Nedostaje privremena fascikla",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Datoteka je samo delimično postavljena",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Datoteka sa istim imenom već postoji",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Datoteka premašuje upload_max_filesize (php.ini direktiva)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Postavljanje datoteke je zaustavnjeno za ekstenziju",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Datoteka je prevelika",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Datoteka je premala",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Postavljeni bajtovi premašuju veličinu datoteke",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Postavljeno",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Upisivanje datoteke na disk nije uspelo",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Promenjena vrednost na '%s' : %s",
     "UPDATEURL.CONFIRM": "Da li želite da promenim URL na:\n\n\n%s\/\n\nKlikni na U redu da bi URL bio promenjen, klikni na Odustani da bi ostalo:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL je promenjen na\n'%s'",
-    "UploadField.ConfirmDelete": "Da li ste sigurni da želite da izbrišete ovu datoteku sa datotečkog sistema servera?",
-    "UploadField.EMPTYRESULT": "Rezultat postavljanja je prazna datoteka",
-    "UploadField.Editing": "Uređivanje...",
-    "UploadField.HTML_MAXFILESIZE": "Datoteka premašuje MAX_FILE_SIZE (HTML direktiva obrazaca)",
-    "UploadField.INVALIDEXTENSION": "Ekstenzija nije dozvoljena",
-    "UploadField.LOADING": "Učitavanje...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Maksimalan broj datoteka je premašen",
-    "UploadField.NOFILEUPLOADED": "Ni jedna datoteka nije postavljena",
-    "UploadField.NOTMPFOLDER": "Nedostaje privremena fascikla",
-    "UploadField.ONLYPARTIALUPLOADED": "Datoteka je samo delimično postavljena",
-    "UploadField.OVERWRITEWARNING": "Datoteka sa istim imenom već postoji",
-    "UploadField.PHP_MAXFILESIZE": "Datoteka premašuje upload_max_filesize (php.ini direktiva)",
-    "UploadField.STOPEDBYEXTENSION": "Postavljanje datoteke je zaustavnjeno za ekstenziju",
-    "UploadField.TOOLARGE": "Datoteka je prevelika",
-    "UploadField.TOOSMALL": "Datoteka je premala",
-    "UploadField.UPLOADEDBYTES": "Postavljeni bajtovi premašuju veličinu datoteke",
-    "UploadField.Uploaded": "Postavljeno",
-    "UploadField.WRITEFAILED": "Upisivanje datoteke na disk nije uspelo",
     "VALIDATOR.FIELDREQUIRED": "Molimo Vas da popunite \"%s\", obavezno je."
 }
\ No newline at end of file
diff --git a/client/lang/src/sv.js b/client/lang/src/sv.js
index c0d0f8b64..093e19fc2 100644
--- a/client/lang/src/sv.js
+++ b/client/lang/src/sv.js
@@ -9,6 +9,24 @@
     "LOADING": "laddar...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "Tecknet '%s' kan inte användas i detta fält",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Din webbläsare är inte kompatibel med detta CMS. Var god använd Internet Explorer 7+, Google Chrome 10+ eller Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Är du säker på att du vill radera denna fil från servern?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Tomt uppladdningsresultat",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Redigerar ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "Filen överskrider MAX_FILE_SIZE (HTML form-direktiv)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Filtypen tillåts inte",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Laddar ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Maximalt antal filer överstiget",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "Ingen fil laddades upp",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Tillfällig mapp saknas",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "Filen laddades bara upp delvis",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "Fil med samma namn existerar redan",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "Filen överskrider upload_max_filesize (php-ini-direktiv)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "Uppladdning stoppades av otillåten filtyp",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filen är för stor",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filen är för liten",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Antalet uppladdade bytes överstiger filstorleken",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uppladdad",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Kunde inte skriva filen",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Ändrade värde till '%s' : %s",
     "UPDATEURL.CONFIRM": "Vill du att URL:en ändras till:\n\n%s\/\n\nKlicka OK för att ändra URL:en, klicka Avbryt för att lämna den som:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "URL:en har ändrats till\n'%s'",
-    "UploadField.ConfirmDelete": "Är du säker på att du vill radera denna fil från servern?",
-    "UploadField.EMPTYRESULT": "Tomt uppladdningsresultat",
-    "UploadField.Editing": "Redigerar ...",
-    "UploadField.HTML_MAXFILESIZE": "Filen överskrider MAX_FILE_SIZE (HTML form-direktiv)",
-    "UploadField.INVALIDEXTENSION": "Filtypen tillåts inte",
-    "UploadField.LOADING": "Laddar ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Maximalt antal filer överstiget",
-    "UploadField.NOFILEUPLOADED": "Ingen fil laddades upp",
-    "UploadField.NOTMPFOLDER": "Tillfällig mapp saknas",
-    "UploadField.ONLYPARTIALUPLOADED": "Filen laddades bara upp delvis",
-    "UploadField.OVERWRITEWARNING": "Fil med samma namn existerar redan",
-    "UploadField.PHP_MAXFILESIZE": "Filen överskrider upload_max_filesize (php-ini-direktiv)",
-    "UploadField.STOPEDBYEXTENSION": "Uppladdning stoppades av otillåten filtyp",
-    "UploadField.TOOLARGE": "Filen är för stor",
-    "UploadField.TOOSMALL": "Filen är för liten",
-    "UploadField.UPLOADEDBYTES": "Antalet uppladdade bytes överstiger filstorleken",
-    "UploadField.Uploaded": "Uppladdad",
-    "UploadField.WRITEFAILED": "Kunde inte skriva filen",
     "VALIDATOR.FIELDREQUIRED": "Var god fyll i \"%s\", det är obligatoriskt."
 }
\ No newline at end of file
diff --git a/client/lang/src/th.js b/client/lang/src/th.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/th.js
+++ b/client/lang/src/th.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/tl.js b/client/lang/src/tl.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/tl.js
+++ b/client/lang/src/tl.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/tr.js b/client/lang/src/tr.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/tr.js
+++ b/client/lang/src/tr.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/tr_TR.js b/client/lang/src/tr_TR.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/tr_TR.js
+++ b/client/lang/src/tr_TR.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/uk.js b/client/lang/src/uk.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/uk.js
+++ b/client/lang/src/uk.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/uk_UA.js b/client/lang/src/uk_UA.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/uk_UA.js
+++ b/client/lang/src/uk_UA.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/uz.js b/client/lang/src/uz.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/uz.js
+++ b/client/lang/src/uz.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/vi.js b/client/lang/src/vi.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/vi.js
+++ b/client/lang/src/vi.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/vi_VN.js b/client/lang/src/vi_VN.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/vi_VN.js
+++ b/client/lang/src/vi_VN.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/zh.js b/client/lang/src/zh.js
index cec2836d8..d57bba7b7 100644
--- a/client/lang/src/zh.js
+++ b/client/lang/src/zh.js
@@ -9,6 +9,24 @@
     "LOADING": "正在加载...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "该字段中不得使用字符 '%s'",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "您的浏览器不兼容 CMS 接口。请使用 Internet Explorer 7、Google Chrome 10 或 Mozilla Firefox 3.5 以上版本。",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "是否确定从服务器文件系统中删除该文件？",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "文件上传结果为空",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "正在编辑...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "文件超出 MAX_FILE_SIZE（HTML 表单指令）",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "不允许使用拓展名",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "正在加载...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "超出最大文件数",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "未上传文件",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "缺少临时文件夹",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "文件仅被部分上传",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "该文件名已被已有文件占用",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "文件超出 upload_max_filesize（php.ini 指令）",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "文件上传被分机停止",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "文件过大",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "文件过小",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "上传的字节数超出文件大小",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "已上传",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "未能将文件写至光盘",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "已将数值更改为 '%s' : %s",
     "UPDATEURL.CONFIRM": "您是否希望我将 URL 更改为：\n\n%s\/\n\n要更改 URL，请单击“确定”，要将 URL 保留为\n\n%s，请单击“取消”",
     "UPDATEURL.CONFIRMURLCHANGED": "URL 已变为\n'%s'",
-    "UploadField.ConfirmDelete": "是否确定从服务器文件系统中删除该文件？",
-    "UploadField.EMPTYRESULT": "文件上传结果为空",
-    "UploadField.Editing": "正在编辑...",
-    "UploadField.HTML_MAXFILESIZE": "文件超出 MAX_FILE_SIZE（HTML 表单指令）",
-    "UploadField.INVALIDEXTENSION": "不允许使用拓展名",
-    "UploadField.LOADING": "正在加载...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "超出最大文件数",
-    "UploadField.NOFILEUPLOADED": "未上传文件",
-    "UploadField.NOTMPFOLDER": "缺少临时文件夹",
-    "UploadField.ONLYPARTIALUPLOADED": "文件仅被部分上传",
-    "UploadField.OVERWRITEWARNING": "该文件名已被已有文件占用",
-    "UploadField.PHP_MAXFILESIZE": "文件超出 upload_max_filesize（php.ini 指令）",
-    "UploadField.STOPEDBYEXTENSION": "文件上传被分机停止",
-    "UploadField.TOOLARGE": "文件过大",
-    "UploadField.TOOSMALL": "文件过小",
-    "UploadField.UPLOADEDBYTES": "上传的字节数超出文件大小",
-    "UploadField.Uploaded": "已上传",
-    "UploadField.WRITEFAILED": "未能将文件写至光盘",
     "VALIDATOR.FIELDREQUIRED": "请填写“%s”，该项目为必填项。"
 }
\ No newline at end of file
diff --git a/client/lang/src/zh_CN.js b/client/lang/src/zh_CN.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/zh_CN.js
+++ b/client/lang/src/zh_CN.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/client/lang/src/zh_TW.js b/client/lang/src/zh_TW.js
index 7cfd09de0..af798f2bf 100644
--- a/client/lang/src/zh_TW.js
+++ b/client/lang/src/zh_TW.js
@@ -9,6 +9,24 @@
     "LOADING": "loading...",
     "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
     "SilverStripe\\Admin\\LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.EMPTYRESULT": "Empty file upload result",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Editing": "Editing ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.INVALIDEXTENSION": "Extension is not allowed",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.LOADING": "Loading ...",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOFILEUPLOADED": "No File was uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.OVERWRITEWARNING": "File with the same name already exists",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOLARGE": "Filesize is too large",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.TOOSMALL": "Filesize is too small",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.Uploaded": "Uploaded",
+    "SilverStripe\\AssetAdmin\\Forms\\UploadField.WRITEFAILED": "Failed to write file to disk",
     "SilverStripe\\Assets\\File.DRAFT": "Draft",
     "SilverStripe\\Assets\\File.MODIFIED": "Modified",
     "SilverStripe\\Assets\\File.PUBLISHED": "Published",
@@ -23,23 +41,5 @@
     "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
     "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s\/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
     "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
-    "UploadField.Editing": "Editing ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
-    "UploadField.INVALIDEXTENSION": "Extension is not allowed",
-    "UploadField.LOADING": "Loading ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
-    "UploadField.NOFILEUPLOADED": "No File was uploaded",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
-    "UploadField.OVERWRITEWARNING": "File with the same name already exists",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
-    "UploadField.TOOLARGE": "Filesize is too large",
-    "UploadField.TOOSMALL": "Filesize is too small",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
-    "UploadField.Uploaded": "Uploaded",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
     "VALIDATOR.FIELDREQUIRED": "Please fill out \"%s\", it is required."
 }
\ No newline at end of file
diff --git a/lang/af.yml b/lang/af.yml
index 807e9e1ab..ab6b9acbc 100644
--- a/lang/af.yml
+++ b/lang/af.yml
@@ -1,5 +1,5 @@
 af:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Eerste opgelaai'
     LASTEDIT: 'Laaste verander'
     SIZE: 'Lêer grootte'
@@ -8,15 +8,17 @@ af:
     ENTERINFO: 'Tik asseblief ''n verbruikersnaam en wagwoord in'
     ERRORNOTADMIN: 'Daardie verbruiker is nie ''n administreerder nie'
     ERRORNOTREC: 'Daar die verbruikersnaam / wagwoord is nie herken nie'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Enige
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'U het die wagwoord vir'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
+    TEXT1: 'Hier is u'
+    TEXT2: 'wagwoord herstel skakel'
+    TEXT3: vir
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Verander Wagwoord'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: R
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     TIMEDIFFAGO: '{difference} terug'
   SilverStripe\Forms\DateField:
     NOTSET: 'Nie gestel nie'
@@ -30,12 +32,8 @@ af:
     CHOOSE: (Kies)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Verskaf asseblief  ''n epos adres '
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Enige
-  ForgotPasswordEmail_ss:
-    TEXT1: 'Hier is u'
-    TEXT2: 'wagwoord herstel skakel'
-    TEXT3: vir
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Wagwoorde pas nie'
     VALIDATIONPASSWORDSNOTEMPTY: 'Wagwoorde kan nie leeg wees nie'
@@ -44,24 +42,10 @@ af:
     VALIDCURRENCY: 'Tik asseblief ''n geldige geldeenheid in '
   SilverStripe\Forms\FormField:
     NONE: geen
-  GridAction:
-    DELETE_DESCRIPTION: Verwyder
-    Delete: Verwyder
-    UnlinkRelation: Ontkoppel
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Voeg {name}'
-    Find: Vind
-    LinkExisting: 'Koppel bestaande'
-    NewRecord: 'Nuwe %s'
-    NoItemsFound: 'Geen items gevind nie'
-    PRINTEDAT: 'Gedruk te'
-    PRINTEDBY: 'Gedruk deur'
-    PlaceHolder: 'Vind {type}'
-    PlaceHolderWithLabels: 'Vind {type} by {name}'
-    RelationSearch: 'Soek vir verwantskap'
-    ResetFilter: Herstel
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Geen toestemming om te verwyder nie'
+  SilverStripe\Forms\GridField\GridField:
+    OF: van
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: 'Kanselleer '
     Create: Skep
@@ -133,7 +117,7 @@ af:
     FIELDLABELCURRENCY: 'Geld eenheid'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}''is nie ''n nommer nie, slegs die nommers kan aanvaar word vir hierdie veld'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Bladsy
     View: Wys
   SilverStripe\Security\Permission:
@@ -168,14 +152,9 @@ af:
     ROLESDESCRIPTION: ' '
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Hoof
-  TableListField:
-    CSVEXPORT: 'Voer uit na CSV lêer'
-    Print: Druk
-  TableListField_PageControls_ss:
-    OF: van
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Sleutel asseblief ''n geldige tyd formaat ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Afmetings
     EDIT: Verander
     EDITINFO: 'Verander die lêer'
diff --git a/lang/ar.yml b/lang/ar.yml
index 7e2f38d2a..dfb1097b9 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -1,5 +1,5 @@
 ar:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'أول المرفوعات'
     LASTEDIT: 'آخر التعديلات'
     SIZE: 'الحجم'
@@ -9,17 +9,19 @@ ar:
     ENTERINFO: 'فضلاً أدخل اسم المستخدم و كلمة المرور'
     ERRORNOTADMIN: 'هذا المستخدم لا يملك صلاحيات الإدارة'
     ERRORNOTREC: 'اسم المستخدم أو الرقم السري غير صحيح'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: أي
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'تم تغيير كلمة المرور لـ'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: أهلاً
+    TEXT1: هنا
+    TEXT2: 'رابط إعادة تعيين كلمة المرور'
+    TEXT3: لـ
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'يجب أن تكون كلمات المرور على الأقل {الحد الأدنى} حرفاً.'
     BETWEEN: 'يجب أن تكون كلمات المرور من {الحد الأدنى} إلى {الحد الأقصى} حرفاً.'
     MAXIMUM: 'يجب أن تكون كلمات المرور على الأكثر {الحد الأقصى} حرفاً.'
     SHOWONCLICKTITLE: 'تغيير كلمة المرور'
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'أقل من دقيقة'
     TIMEDIFFAGO: '{الفرق} منذ'
     TIMEDIFFIN: 'في {الفرق}'
@@ -35,13 +37,8 @@ ar:
     CHOOSE: (اختر)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'يرجى إدخال عنوان بريد إلكتروني'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: أي
-  ForgotPasswordEmail_ss:
-    HELLO: أهلاً
-    TEXT1: هنا
-    TEXT2: 'رابط إعادة تعيين كلمة المرور'
-    TEXT3: لـ
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'رقم المرور غير صحيح'
     VALIDATIONPASSWORDSNOTEMPTY: 'أرقام المرور لا يمكن أن تكون فارغة'
@@ -50,27 +47,11 @@ ar:
     VALIDCURRENCY: 'يرجى إدخال عملة صحيحة'
   SilverStripe\Forms\FormField:
     NONE: لايوجد
-  GridAction:
-    DELETE_DESCRIPTION: حذف
-    Delete: حذف
-    UnlinkRelation: 'إلغاء الربط'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'إضافة {اسم}'
-    Filter: 'مرشح'
-    FilterBy: 'ترشيح باستخدام'
-    Find: ابحث
-    LinkExisting: 'الرابط موجود'
-    NewRecord: 'جديد %s'
-    NoItemsFound: 'لا يوجد عناصر'
-    PRINTEDAT: 'تم الطباعة في'
-    PRINTEDBY: 'تم الطباعة بواسطة'
-    PlaceHolder: 'البحث {النوع}'
-    PlaceHolderWithLabels: 'البحث {نوع} بواسطة {اسم}'
-    RelationSearch: 'ابحث عن علاقة'
-    ResetFilter: 'إعادة تعيين'
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'لا يوجد أية تصريحات حذف'
     EditPermissionsFailure: 'لا يوجد تصريح لإلغاء الربط بين السجلات'
+  SilverStripe\Forms\GridField\GridField:
+    OF: 'من'
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: إلغاء
     Create: إنشاء
@@ -78,7 +59,7 @@ ar:
     DeletePermissionsFailure: 'لا يوجد تصريحات بالحذف'
     Deleted: '%s %s تم حذفه'
     Save: حفظ
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: تعديل
   SilverStripe\Security\Group:
     AddRole: 'إضافة دور لهذه المجموعة'
@@ -155,7 +136,7 @@ ar:
     IsNullLabel: باطل
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{قيمة}'' ليس برقم و الأرقام فقط يمكن قبولها لهذا الحقل'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: صفحة
     View: عرض
   SilverStripe\Security\PasswordValidator:
@@ -163,9 +144,7 @@ ar:
     PREVPASSWORD: 'لقد استخدمت كلمة المرور هذه في الماضي، يرجى اختيار كلمة مرور جديدة'
     TOOSHORT: 'إنّ كلمة السر قصيرة جدا، يجب أن تحتوي على %s أو أكثر من الحروف'
   SilverStripe\Security\Permission:
-    AdminGroup: الإدارة
-    FULLADMINRIGHTS: 'جميع صلاحيات الإدارة'
-    FULLADMINRIGHTS_HELP: 'يتضمن وينقض جميع الأذونات الأخرىالمساندة.'
+    UserPermissionsIntro: 'سوف يتم تعديل التصريحات لدي المجموعات المعينة لهذا المستخدم. راجع قسم المجموعات للإطلاع على تفاصيل التصريحات على مجموعات فردية.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'تم تعيينها إلى "{عنوان}"'
     FromGroup: 'موروثة من المجموعة "{عنوان}"'
@@ -176,8 +155,6 @@ ar:
     Title: عنوان
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'لا يمكن تعيين كود "s%" مع سماحيات مميزة (يتطلب دخول اعن طريق المشرف)'
-  Permissions:
-    UserPermissionsIntro: 'سوف يتم تعديل التصريحات لدي المجموعات المعينة لهذا المستخدم. راجع قسم المجموعات للإطلاع على تفاصيل التصريحات على مجموعات فردية.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'فضلاً أدخل رقم هاتف صحيح'
   SilverStripe\Security\Security:
@@ -203,14 +180,9 @@ ar:
     ROLESDESCRIPTION: 'هذا القسم يسمح لك بإضافة الأدوار إلى هذه المجموعة. قواعد المجموعات بمنطقية من الأذونات، والتي يمكن تعديلها في تبويب القواعد'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: الرئيسة
-  TableListField:
-    CSVEXPORT: 'تصدير إلى CSV'
-    Print: طباعة
-  TableListField_PageControls_ss:
-    OF: 'من'
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'الرجاء إدخال صيغة وقت صحيحة ({صيغة})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: الأبعاد
     EDIT: تعديل
     EDITINFO: 'قم بتعديل هذا الملف'
diff --git a/lang/ast.yml b/lang/ast.yml
index 94c4b38f7..4ff29ba69 100644
--- a/lang/ast.yml
+++ b/lang/ast.yml
@@ -1,5 +1,5 @@
 ast:
-  ChangePasswordEmail_ss:
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Camudasti la contraseña pa'
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Camudar contraseña'
diff --git a/lang/az.yml b/lang/az.yml
index b872c5ed5..eb85fd629 100644
--- a/lang/az.yml
+++ b/lang/az.yml
@@ -3,11 +3,13 @@ az:
     ENTERINFO: 'Zəhmət olmasa istifadəçi adı və ya parolu yazın.'
     ERRORNOTADMIN: 'İstifadəçi administrator deyil'
     ERRORNOTREC: 'Belə istifadəçi adı və ya parol tanınmadı'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: İstənilən
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Siz parolu bu url üçün dəyişdiniz'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Salam
+    TEXT1: 'Burada sizin'
+    TEXT2: 'parolu sıfırlma linki'
+    TEXT3: üçün
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Parolu dəyiş'
   SilverStripe\Forms\DateField:
@@ -15,13 +17,8 @@ az:
     TODAY: 'bu gün'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Seçin)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: İxtiyari
-  ForgotPasswordEmail_ss:
-    HELLO: Salam
-    TEXT1: 'Burada sizin'
-    TEXT2: 'parolu sıfırlma linki'
-    TEXT3: üçün
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Parollar uyğun gəlmir'
     VALIDATIONPASSWORDSNOTEMPTY: 'Parollar boş ola bilməz'
@@ -97,5 +94,5 @@ az:
     ROLES: Rollar
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Əsas
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'CSV-yə ixrac et'
diff --git a/lang/bg.yml b/lang/bg.yml
index 05912108c..d13263725 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -1,5 +1,5 @@
 bg:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: Създаден
     HEIGHT: Височина
     LASTEDIT: 'Последна промяна'
@@ -11,7 +11,7 @@ bg:
     ENTERINFO: 'Моля, въведете потребителско име и парола.'
     ERRORNOTADMIN: 'Този потребител не е администратор.'
     ERRORNOTREC: 'Това потребителско име / парола не е разпознато'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Всички
     NOANSWER: Не
     YESANSWER: Да
@@ -23,9 +23,11 @@ bg:
     SUCCESS: Успешно
     TimedOutTitleAnonymous: 'Вашата сесия е изтекла.'
     TimedOutTitleMember: 'Здравей {name}!<br />Твоята сесия е изтекла.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Вие сменихте вашата парола за'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Здравей!
+    TEXT1: 'Това е Вашият'
+    TEXT2: 'адрес за рестартирване на парола'
+    TEXT3: за
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Не
     YESANSWER: Да
@@ -34,7 +36,7 @@ bg:
     BETWEEN: 'Паролата трябва да е дълга от {min} до {max} символа.'
     MAXIMUM: 'Паролата трябва да е дълга макс. {max} символа.'
     SHOWONCLICKTITLE: 'Промяна на парола'
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'по-малко от минута'
     TIMEDIFFAGO: 'преди {difference}'
     TIMEDIFFIN: 'за {difference}'
@@ -50,13 +52,8 @@ bg:
     CHOOSE: (Избери)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Моля, въведете имейл адрес'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Някой
-  ForgotPasswordEmail_ss:
-    HELLO: Здравей!
-    TEXT1: 'Това е Вашият'
-    TEXT2: 'адрес за рестартирване на парола'
-    TEXT3: за
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Паролите не съвпадат'
     VALIDATIONPASSWORDSNOTEMPTY: 'Паролите не може да бъдат празни'
@@ -65,26 +62,10 @@ bg:
     VALIDCURRENCY: 'Моля, въведете коректна валута.'
   SilverStripe\Forms\FormField:
     NONE: нищо
-  GridAction:
-    DELETE_DESCRIPTION: Изтриване
-    Delete: Изтрий
-    UnlinkRelation: Откачане
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Добави {name}'
-    Filter: Филтър
-    FilterBy: 'Филтриране по'
-    Find: Търси
-    LinkExisting: 'Свържи към съществуващ'
-    NewRecord: 'Нов %s'
-    NoItemsFound: 'Няма намерени елементи'
-    PRINTEDAT: 'Отпечатано на'
-    PRINTEDBY: 'Отпечатано от'
-    PlaceHolder: 'Намери {type}'
-    PlaceHolderWithLabels: 'Намери {type} по {name}'
-    RelationSearch: 'Търсене на връзка'
-    ResetFilter: Изчистване
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Изтриването не е разрешено'
+  SilverStripe\Forms\GridField\GridField:
+    CSVEXPORT: 'Експортирай на CSV'
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     Create: Създай
     Delete: Изтрий
@@ -183,11 +164,9 @@ bg:
     ROLESDESCRIPTION: 'Ролите са предварително зададени сетове от разрешения и могат да бъдат присвоявани на групи.<br />Ако е нужно, те се наследяват от родителските групи.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Главно
-  TableListField:
-    CSVEXPORT: 'Експортирай на CSV'
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Моля, въведете валиден формат за дата ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: 'Размери'
     EDITINFO: 'Редактирай този файл'
     FIELDNOTSET: 'Информация за файла не беше намерена'
diff --git a/lang/bs.yml b/lang/bs.yml
index d00c44f3e..228b3d776 100644
--- a/lang/bs.yml
+++ b/lang/bs.yml
@@ -1,5 +1,5 @@
 bs:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Prvo postavljeno'
     LASTEDIT: 'Zadnja promjena'
     SIZE: Veličina
@@ -8,12 +8,14 @@ bs:
     ENTERINFO: 'Molimo, unesite korisničko ime i šifru.'
     ERRORNOTADMIN: 'Ovaj korisnik nije administrator.'
     ERRORNOTREC: 'Korisničko ime / šifra nije prepoznata'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     NOANSWER: Ne
     YESANSWER: Da
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Promijenili ste svoju šifru za'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Pozdrav
+    TEXT1: 'Ovo je Vaš'
+    TEXT2: 'link za ponovno podešavanje šifre'
+    TEXT3: za
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Ne
     YESANSWER: Da
@@ -24,11 +26,6 @@ bs:
     TODAY: danas
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Izaberite)
-  ForgotPasswordEmail_ss:
-    HELLO: Pozdrav
-    TEXT1: 'Ovo je Vaš'
-    TEXT2: 'link za ponovno podešavanje šifre'
-    TEXT3: za
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Šifre se ne slažu'
     VALIDATIONPASSWORDSNOTEMPTY: 'Polja za unos šifre ne smiju ostati prazna'
@@ -78,5 +75,5 @@ bs:
     PERMISSIONS: Ovlaštenja
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Glavno
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'Izvezi u CSV'
diff --git a/lang/ca.yml b/lang/ca.yml
index 097ba17df..e65807383 100644
--- a/lang/ca.yml
+++ b/lang/ca.yml
@@ -1,5 +1,5 @@
 ca:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Carregat per primer cop'
     LASTEDIT: 'Darrer canvi'
     SIZE: Mida
@@ -8,9 +8,11 @@ ca:
     ENTERINFO: 'Si us plau, introduïu un nom d''usuari i contrasenya'
     ERRORNOTADMIN: 'Aquest usuari no és un administrador.'
     ERRORNOTREC: 'Aquest nom d''usuari / contrasenya no es reconeix'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Heu canviat la vostra contrasenya per'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hola
+    TEXT1: 'Aquí teniu el vostre'
+    TEXT2: 'enllaç de reinici de la contrasenya'
+    TEXT3: per
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Canvia la contrasenya'
   SilverStripe\Forms\CurrencyField:
@@ -20,11 +22,6 @@ ca:
     TODAY: avui
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Trieu)
-  ForgotPasswordEmail_ss:
-    HELLO: Hola
-    TEXT1: 'Aquí teniu el vostre'
-    TEXT2: 'enllaç de reinici de la contrasenya'
-    TEXT3: per
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Les contrasenyes no concorden'
     VALIDATIONPASSWORDSNOTEMPTY: 'Les contrasenyes no poden deixar-se en blanc'
@@ -90,5 +87,5 @@ ca:
     PERMISSIONS: Permisos
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principal
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'Exporta a CSV'
diff --git a/lang/cs.yml b/lang/cs.yml
index 5cc8f59bd..caeff58d6 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -1,5 +1,5 @@
 cs:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Poprvé nahráno'
     HEIGHT: Výška
     LASTEDIT: 'Naposledy změněno'
@@ -11,7 +11,7 @@ cs:
     ENTERINFO: 'Prosím zadejte uživatelské jméno a heslo.'
     ERRORNOTADMIN: 'Tento uživatel není administrátor.'
     ERRORNOTREC: 'Toto uživatelské jméno / heslo nebylo rozpoznáno'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Jakkýkoliv
     NOANSWER: Ne
     YESANSWER: Ano
@@ -27,10 +27,11 @@ cs:
     SUCCESSCONTENT: '<p>Úspěšné přihlášení. Pokud nebudete automaticky přesměrován <a target="_top" href="{link}">klikněte sem</a></p>'
     TimedOutTitleAnonymous: 'Čas Vašeho sezení vypršel.'
     TimedOutTitleMember: 'Ahoj {name}!<br />Čas Vašeho sezení vypršel.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Vaše heslo bylo změněno pro'
-    CHANGEPASSWORDTEXT3: 'Změnit heslo'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: 'Dobrý den'
+    TEXT1: 'Zde je Váš'
+    TEXT2: 'odkaz na reset hesla'
+    TEXT3: pro
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Ne
     YESANSWER: Ano
@@ -44,7 +45,7 @@ cs:
     SHOWONCLICKTITLE: 'Změnit heslo'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: Kč
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'méně než minuta'
     TIMEDIFFAGO: 'před {difference}'
     TIMEDIFFIN: 'v {difference}'
@@ -62,13 +63,8 @@ cs:
     SOURCE_VALIDATION: 'Prosím vyberte hodnotu v seznamu. {value} není platná volba'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Prosím zadejte e-mailovou adresu'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Jakkýkoli
-  ForgotPasswordEmail_ss:
-    HELLO: 'Dobrý den'
-    TEXT1: 'Zde je Váš'
-    TEXT2: 'odkaz na reset hesla'
-    TEXT3: pro
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Čas Vašeho sezení vypršel. Prosím znovu odešlete formulář.'
     CSRF_FAILED_MESSAGE: 'Vypadá to, že to musí být technický problém. Kliněte prosím na tlačítko zpět, obnovte váš prohlížeč a zkuste opět.'
@@ -80,27 +76,11 @@ cs:
     VALIDCURRENCY: 'Prosím zadejte platnou měnu'
   SilverStripe\Forms\FormField:
     NONE: žádný
-  GridAction:
-    DELETE_DESCRIPTION: Smazat
-    Delete: Smazat
-    UnlinkRelation: Odpojit
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Přidat {name}'
-    Filter: Filtr
-    FilterBy: 'Filtrovat podle'
-    Find: Hledat
-    LinkExisting: 'Odkaz existující'
-    NewRecord: 'Nový %s'
-    NoItemsFound: 'Žádné položky'
-    PRINTEDAT: 'Vytištěno v'
-    PRINTEDBY: Vytištěno
-    PlaceHolder: 'Hledat {type}'
-    PlaceHolderWithLabels: 'Hledat {type} podle {name}'
-    RelationSearch: 'Vztah hledání'
-    ResetFilter: Resetovat
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Žádná oprávnění mazat'
     EditPermissionsFailure: 'Žádné oprávnění pro rozpojení záznamu'
+  SilverStripe\Forms\GridField\GridField:
+    OF: z
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Storno
     Create: Vytvořit
@@ -108,7 +88,7 @@ cs:
     DeletePermissionsFailure: 'Žádná oprávnění mazat'
     Deleted: 'Smazáno %s %s'
     Save: Uložit
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Editovat
   SilverStripe\Security\Group:
     PLURALNAME: Skupiny
@@ -186,7 +166,7 @@ cs:
     IsNullLabel: 'Je nulové'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' není číslo, pouze čísla mohou být akceptována pro toto pole'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Stránka
     View: Zobrazit
   SilverStripe\Security\PasswordValidator:
@@ -194,8 +174,7 @@ cs:
     PREVPASSWORD: 'Již jste použil toto heslo v minulosti, vyberte nové heslo, prosím'
     TOOSHORT: 'Heslo je příliš krátké, musí být %s nebo více znaků dlouhé'
   SilverStripe\Security\Permission:
-    PLURALNAME: Oprávnění
-    SINGULARNAME: Oprávnění
+    UserPermissionsIntro: 'Přiřazení skupin tomuto uživatelovi upraví oprávnění, které má. Podívejte se sekcie skupiny pro podrobnosti o oprávněních k jednotlivým skupinám.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'přiděleno k "{title}"'
     FromGroup: 'zdědeno ze skupiny "{title}"'
@@ -207,8 +186,6 @@ cs:
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: 'Kódy role oprávnění'
     SINGULARNAME: 'Kód role oprávnění'
-  Permissions:
-    UserPermissionsIntro: 'Přiřazení skupin tomuto uživatelovi upraví oprávnění, které má. Podívejte se sekcie skupiny pro podrobnosti o oprávněních k jednotlivým skupinám.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Prosím zadejte platné telefonní číslo'
   SilverStripe\Security\Security:
@@ -240,14 +217,9 @@ cs:
     SINGULARNAME: 'Členské heslo'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Hlavní
-  TableListField:
-    CSVEXPORT: 'Exportovat do souboru CSV'
-    Print: Tisk
-  TableListField_PageControls_ss:
-    OF: z
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Prosím zadejte platný formát času ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Rozměry
     EDIT: Editovat
     EDITINFO: 'Editovat tento soubor'
diff --git a/lang/da.yml b/lang/da.yml
index d686ce01e..ad8f31fc9 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -1,5 +1,5 @@
 da:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Først uploadet'
     LASTEDIT: 'Sidst ændret'
     SIZE: Størrelse
diff --git a/lang/de.yml b/lang/de.yml
index 09d762c38..a5d22f6d8 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -1,5 +1,5 @@
 de:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Erstmalig hochgeladen'
     HEIGHT: Höhe
     LASTEDIT: 'Letzte Änderung'
@@ -11,7 +11,7 @@ de:
     ENTERINFO: 'Bitte geben Sie einen Nutzernamen und ein Passwort ein'
     ERRORNOTADMIN: 'Dieser Nutzer ist kein Administrator'
     ERRORNOTREC: 'Der  Nutzername oder das Passwort wurden nicht erkannt'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: alle
     NOANSWER: Nein
     YESANSWER: Ja
@@ -27,10 +27,11 @@ de:
     SUCCESSCONTENT: '<p>Login erfolgreich. Falls Sie nicht automatisch weitergeleitet werden, bitte <a target="_top" href="{link}">hier klicken</a></p>'
     TimedOutTitleAnonymous: 'Ihre Sitzung ist abgelaufen.'
     TimedOutTitleMember: 'Hallo {name}!<br />Ihre Sitzung ist abgelaufen.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Sie haben Ihr Passwort geändert für'
-    CHANGEPASSWORDTEXT3: 'Passwort ändern'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hallo
+    TEXT1: 'Hier ist Ihr'
+    TEXT2: 'Link zum Zurücksetzen des Passworts'
+    TEXT3: für
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Nein
     YESANSWER: Ja
@@ -42,7 +43,7 @@ de:
     SHOWONCLICKTITLE: 'Passwort ändern'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: €
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'weniger als eine Minute'
     TIMEDIFFAGO: 'vor {difference}'
     TIMEDIFFIN: 'in {difference}'
@@ -60,13 +61,8 @@ de:
     SOURCE_VALIDATION: 'Bitte wählen Sie aus der Liste. {value} ist kein gültiger Wert'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Bitte geben Sie eine E-Mail-Adresse ein'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: alle
-  ForgotPasswordEmail_ss:
-    HELLO: Hallo
-    TEXT1: 'Hier ist Ihr'
-    TEXT2: 'Link zum Zurücksetzen des Passworts'
-    TEXT3: für
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Ihre Sitzung ist abgelaufen. Bitte schicken Sie das Formular erneut ab.'
     CSRF_FAILED_MESSAGE: 'Es gab ein technisches Problem. Bitte versuchen Sie es erneut, nachdem sie die vorherige Seite neu geladen haben.'
@@ -78,27 +74,11 @@ de:
     VALIDCURRENCY: 'Bitte geben Sie einen korrekten Betrag ein'
   SilverStripe\Forms\FormField:
     NONE: keine
-  GridAction:
-    DELETE_DESCRIPTION: Löschen
-    Delete: Löschen
-    UnlinkRelation: 'Verbindung entfernen'
-  SilverStripe\Forms\GridField\GridField:
-    Add: '{name} hinzufügen'
-    Filter: Filter
-    FilterBy: 'Filtern nach'
-    Find: Suchen
-    LinkExisting: 'Bestehenden Datensatz verknüpfen'
-    NewRecord: 'Neue(r) %s'
-    NoItemsFound: 'Keine Elemente gefunden'
-    PRINTEDAT: 'Gedruckt am'
-    PRINTEDBY: 'Gedruckt von'
-    PlaceHolder: '{type} suchen'
-    PlaceHolderWithLabels: 'Suche {type} über {name}'
-    RelationSearch: Relationssuche
-    ResetFilter: Zurücksetzen
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Keine Berechtigung zum Löschen'
     EditPermissionsFailure: 'Sie haben keine Berechtigung, die Verknüpfung zu lösen'
+  SilverStripe\Forms\GridField\GridField:
+    OF: von
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Abbrechen
     Create: Erstellen
@@ -106,7 +86,7 @@ de:
     DeletePermissionsFailure: 'Keine Berechtigungen zum löschen'
     Deleted: 'Gelöscht %s %s'
     Save: Speichern
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Bearbeiten
   SilverStripe\Security\Group:
     PLURALNAME: Gruppen
@@ -177,7 +157,7 @@ de:
     IsNullLabel: 'ist NULL'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' ist kein numerischer Wert, nur nummerische Werte sind in diesem Feld erlaubt'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Seite
     View: Anzeigen
   SilverStripe\Security\PasswordValidator:
@@ -185,8 +165,7 @@ de:
     PREVPASSWORD: 'Sie haben dieses Passwort schon einmal verwendet. Bitte wählen Sie ein neues Passwort'
     TOOSHORT: 'Das Passwort ist zu kurz, es muss mindestens %s Zeichen lang sein'
   SilverStripe\Security\Permission:
-    PLURALNAME: Berechtigungen
-    SINGULARNAME: Zugriffsberechtigung
+    UserPermissionsIntro: 'Durch das Hinzufügen von Benutzern zu Gruppen, werden dessen Rechte angepasst. Mehr Informationen über die Berechtigungen der einzelnen Gruppen erhältst Du im Abschnitt Gruppen.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'Zugewiesen an "{title}"'
     FromGroup: 'abgeleited von Gruppe "{title}"'
@@ -198,8 +177,6 @@ de:
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: Berechtigungsrollencodes
     SINGULARNAME: Berechtigungsrollencode
-  Permissions:
-    UserPermissionsIntro: 'Durch das Hinzufügen von Benutzern zu Gruppen, werden dessen Rechte angepasst. Mehr Informationen über die Berechtigungen der einzelnen Gruppen erhältst Du im Abschnitt Gruppen.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Bitte geben Sie eine gültige Telefonnummer ein'
   SilverStripe\Security\Security:
@@ -231,14 +208,9 @@ de:
     SINGULARNAME: Benutzerpasswort
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Hauptteil
-  TableListField:
-    CSVEXPORT: 'Als CSV-Datei exportieren'
-    Print: Drucken
-  TableListField_PageControls_ss:
-    OF: von
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Bitte geben Sie die Uhrzeit im korrekten Format ein ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensionen
     EDIT: Bearbeiten
     EDITINFO: 'Diese Datei bearbeiten'
diff --git a/lang/el.yml b/lang/el.yml
index 242455035..3e1f0aabe 100644
--- a/lang/el.yml
+++ b/lang/el.yml
@@ -1,4 +1,4 @@
 el:
-  Boolean:
-    NOANSWER: 'Όχι'
-    YESANSWER: 'Ναί'
+  SilverStripe\ORM\FieldType\DBBoolean:
+    NOANSWER: Όχι
+    YESANSWER: Ναί
diff --git a/lang/en.yml b/lang/en.yml
index 1bea795af..f8707ba1d 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -1,5 +1,5 @@
 en:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'First uploaded'
     HEIGHT: Height
     LASTEDIT: 'Last changed'
@@ -11,7 +11,7 @@ en:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Any
     NOANSWER: 'No'
     YESANSWER: 'Yes'
@@ -28,15 +28,15 @@ en:
     SUCCESSCONTENT: '<p>Login success. If you are not automatically redirected <a target="_top" href="{link}">click here</a></p>'
     TimedOutTitleAnonymous: 'Your session has timed out.'
     TimedOutTitleMember: 'Hey {name}!<br />Your session has timed out.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDFOREMAIL: 'The password for account with email address {email} has been changed. If you didn\''t change your password please change your password using the link below'
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
-    CHANGEPASSWORDTEXT3: 'Change password'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   SilverStripe\Forms\CheckboxField:
     NOANSWER: 'No'
     YESANSWER: 'Yes'
-  CheckboxSetField_ss:
+  SilverStripe\Forms\CheckboxSetField.ss:
     NOOPTIONSAVAILABLE: 'No options available'
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
@@ -48,10 +48,25 @@ en:
     SHOWONCLICKTITLE: 'Change Password'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
-    LessThanMinuteAgo: 'less than a minute'
-    TIMEDIFFAGO: '{difference} ago'
-    TIMEDIFFIN: 'in {difference}'
+  SilverStripe\ORM\FieldType\DBDate:
+    DAYS_SHORT_PLURALS:
+      one: '{count} day'
+      other: '{count} days'
+    HOURS_SHORT_PLURALS:
+      one: '{count} hour'
+      other: '{count} hours'
+    MINUTES_SHORT_PLURALS:
+      one: '{count} min'
+      other: '{count} mins'
+    MONTHS_SHORT_PLURALS:
+      one: '{count} month'
+      other: '{count} months'
+    SECONDS_SHORT_PLURALS:
+      one: '{count} sec'
+      other: '{count} secs'
+    YEARS_SHORT_PLURALS:
+      one: '{count} year'
+      other: '{count} years'
   SilverStripe\Forms\DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -66,13 +81,8 @@ en:
     SOURCE_VALIDATION: 'Please select a value within the list provided. {value} is not a valid option'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Please enter an email address'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Any
-  ForgotPasswordEmail_ss:
-    HELLO: Hi
-    TEXT1: 'Here is your'
-    TEXT2: 'password reset link'
-    TEXT3: for
   SilverStripe\Forms\Form:
     BAD_METHOD: 'This form requires a {method} submission'
     CSRF_EXPIRED_MESSAGE: 'Your session has expired. Please re-submit the form.'
@@ -86,27 +96,11 @@ en:
   SilverStripe\Forms\FormField:
     EXAMPLE: 'e.g. {format}'
     NONE: none
-  GridAction:
-    DELETE_DESCRIPTION: Delete
-    Delete: Delete
-    UnlinkRelation: Unlink
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Add {name}'
-    Filter: Filter
-    FilterBy: 'Filter by '
-    Find: Find
-    LinkExisting: 'Link Existing'
-    NewRecord: 'New %s'
-    NoItemsFound: 'No items found'
-    PRINTEDAT: 'Printed at'
-    PRINTEDBY: 'Printed by'
-    PlaceHolder: 'Find {type}'
-    PlaceHolderWithLabels: 'Find {type} by {name}'
-    RelationSearch: 'Relation search'
-    ResetFilter: Reset
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'No delete permissions'
     EditPermissionsFailure: 'No permission to unlink record'
+  SilverStripe\Forms\GridField\GridField:
+    OF: of
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -114,7 +108,7 @@ en:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Edit
   SilverStripe\Security\Group:
     PLURALNAME: Groups
@@ -202,7 +196,7 @@ en:
     IsNullLabel: 'Is Null'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Page
     View: View
   SilverStripe\Security\PasswordValidator:
@@ -210,11 +204,7 @@ en:
     PREVPASSWORD: 'You''ve already used that password in the past, please choose a new password'
     TOOSHORT: 'Password is too short, it must be %s or more characters long'
   SilverStripe\Security\Permission:
-    PLURALNAME: Permissions
-    PLURALS:
-      one: 'A Permission'
-      other: '{count} Permissions'
-    SINGULARNAME: Permission
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -232,8 +222,6 @@ en:
       one: 'A Permission Role Code'
       other: '{count} Permission Role Codes'
     SINGULARNAME: 'Permission Role Code'
-  Permissions:
-    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   SilverStripe\Security\Security:
@@ -263,25 +251,6 @@ en:
       one: 'A Data Object'
       other: '{count} Data Objects'
     SINGULARNAME: 'Data Object'
-  SilverStripe\ORM\FieldType\DBDate:
-    DAYS_SHORT_PLURALS:
-      one: '{count} day'
-      other: '{count} days'
-    HOURS_SHORT_PLURALS:
-      one: '{count} hour'
-      other: '{count} hours'
-    MINUTES_SHORT_PLURALS:
-      one: '{count} min'
-      other: '{count} mins'
-    MONTHS_SHORT_PLURALS:
-      one: '{count} month'
-      other: '{count} months'
-    SECONDS_SHORT_PLURALS:
-      one: '{count} sec'
-      other: '{count} secs'
-    YEARS_SHORT_PLURALS:
-      one: '{count} year'
-      other: '{count} years'
   SilverStripe\Security\MemberPassword:
     PLURALNAME: 'Member Passwords'
     PLURALS:
@@ -298,15 +267,9 @@ en:
     LIMITED_TITLE: 'Too many children ({count}}'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Main
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    CSVIMPORT: 'Import CSV'
-    Print: Print
-  TableListField_PageControls_ss:
-    OF: of
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensions
     EDIT: Edit
     EDITINFO: 'Edit this file'
diff --git a/lang/en_GB.yml b/lang/en_GB.yml
index 2e8214b82..f2c8c7522 100644
--- a/lang/en_GB.yml
+++ b/lang/en_GB.yml
@@ -1,10 +1,8 @@
 en_GB:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     SIZE: Size
     TYPE: Type
-  ChangePasswordEmail_ss:
-    HELLO: Hello
-  ForgotPasswordEmail_ss:
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hello
   SilverStripe\Security\Member:
     ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
diff --git a/lang/eo.yml b/lang/eo.yml
index 73d42721f..fc3306653 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -1,5 +1,5 @@
 eo:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Unue alŝutita'
     HEIGHT: Alto
     LASTEDIT: 'Laste ŝanĝita'
@@ -11,7 +11,7 @@ eo:
     ENTERINFO: 'bonvolu enigi salutnomon kaj pasvorton.'
     ERRORNOTADMIN: 'Tiu uzanto ne estas administranto.'
     ERRORNOTREC: 'Kiuj salutnomo / pasvorto ne estas rekonebla'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Ajna
     NOANSWER: Ne
     YESANSWER: Jes
@@ -27,15 +27,15 @@ eo:
     SUCCESSCONTENT: '<p>Ensaluto suksesis. Se vi ne aŭtomate alidirektiĝos, <a target="_top" href="{link}">alklaku ĉi tie</a></p>'
     TimedOutTitleAnonymous: 'Via seanco eltempiĝis.'
     TimedOutTitleMember: 'He, {name}!<br />Via seanco eltempiĝis.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDFOREMAIL: 'La pasvorto por la konto kun retadreso {email} estas ŝanĝita. Se vi ne ŝanĝis vian pasvorton bonvolu ŝanĝi vian pasvorton per la suba ligilo.'
-    CHANGEPASSWORDTEXT1: 'Vi ŝanĝis vian pasvorton por'
-    CHANGEPASSWORDTEXT3: 'Ŝangi pasvorton'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Saluton
+    TEXT1: 'Jen via'
+    TEXT2: 'pasvorta reagorda ligilo'
+    TEXT3: por
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Ne
     YESANSWER: Jes
-  CheckboxSetField_ss:
+  SilverStripe\Forms\CheckboxSetField.ss:
     NOOPTIONSAVAILABLE: 'Mankas ebloj'
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Pasvorto devas esti almenaŭ {min} signojn longa.'
@@ -47,7 +47,7 @@ eo:
     SHOWONCLICKTITLE: 'Ŝangi Pasvorton'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'malpli ol minuto'
     TIMEDIFFAGO: 'antaŭ {difference}'
     TIMEDIFFIN: 'en {difference}'
@@ -65,13 +65,8 @@ eo:
     SOURCE_VALIDATION: 'Bonvolu elekti valoron el la listo donita. {value} ne estas valida agordo'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Bonvolu enigi readreson'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Ajna
-  ForgotPasswordEmail_ss:
-    HELLO: Saluton
-    TEXT1: 'Jen via'
-    TEXT2: 'pasvorta reagorda ligilo'
-    TEXT3: por
   SilverStripe\Forms\Form:
     BAD_METHOD: 'Ĉi tiu formularo bezonas {method} sendaĵon'
     CSRF_EXPIRED_MESSAGE: 'Via seanco finiĝis. Bonvole resendu la formularon.'
@@ -85,27 +80,11 @@ eo:
   SilverStripe\Forms\FormField:
     EXAMPLE: 'ekz-e {format}'
     NONE: neniu
-  GridAction:
-    DELETE_DESCRIPTION: Forigi
-    Delete: Forigi
-    UnlinkRelation: Malligi
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Aldoni je {name}'
-    Filter: Filtri
-    FilterBy: 'Filtri laŭ'
-    Find: Serĉi
-    LinkExisting: 'Ligi ekzistantajn'
-    NewRecord: 'Novaj %s'
-    NoItemsFound: 'Neniu elemento troviĝis'
-    PRINTEDAT: 'Presita ĉe'
-    PRINTEDBY: 'Presita de'
-    PlaceHolder: 'Serĉi je {type}'
-    PlaceHolderWithLabels: 'Serĉi je {type} laŭ {name}'
-    RelationSearch: 'Serĉi rilatojn'
-    ResetFilter: Restartigi
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Mankas permeso forigi'
     EditPermissionsFailure: 'Mankas permeso malligi rikordon'
+  SilverStripe\Forms\GridField\GridField:
+    OF: de
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Rezigni
     Create: Krei
@@ -113,7 +92,7 @@ eo:
     DeletePermissionsFailure: 'Mankas permeso forigi'
     Deleted: 'Forigita %s %s'
     Save: Konservi
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Redakti
   SilverStripe\Security\Group:
     PLURALNAME: Grupoj
@@ -192,7 +171,7 @@ eo:
     IsNullLabel: 'Estas senvalora'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' ne estas numero, nur numeroj estas akcepteblaj por ĉi tiu kampo'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Paĝo
     View: Vido
   SilverStripe\Security\PasswordValidator:
@@ -200,8 +179,7 @@ eo:
     PREVPASSWORD: 'Vi jam uzis tiun pasvorton pasintece, do bonvole elektu novan pasvorton'
     TOOSHORT: 'Pasvorto estas tro mallonga; ĝi devas esti almenaŭ %s signojn longa'
   SilverStripe\Security\Permission:
-    PLURALNAME: Permesoj
-    SINGULARNAME: Permeso
+    UserPermissionsIntro: 'Atribui grupojn al la uzanto modifos iliajn permesojn. Vidu la grupan sekcion por detaloj de permesoj pri unuopa grupo.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'agordita al "{title}"'
     FromGroup: 'heredita el grupo "{title}"'
@@ -213,8 +191,6 @@ eo:
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: 'Permesrolaj kodoj'
     SINGULARNAME: 'Permesrola kodo'
-  Permissions:
-    UserPermissionsIntro: 'Atribui grupojn al la uzanto modifos iliajn permesojn. Vidu la grupan sekcion por detaloj de permesoj pri unuopa grupo.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Bonvolu enigi validan telefonnumeron'
   SilverStripe\Security\Security:
@@ -246,15 +222,9 @@ eo:
     SINGULARNAME: 'Membra pasvorto'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Ĉefaj
-  TableListField:
-    CSVEXPORT: 'Eksporti al CSV'
-    CSVIMPORT: 'Importi el CSV'
-    Print: Presi
-  TableListField_PageControls_ss:
-    OF: de
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Bonvole enigu validan horan formaton ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensioj
     EDIT: Redakti
     EDITINFO: 'Redakti ĉi tiun dosieron'
diff --git a/lang/es.yml b/lang/es.yml
index db7bdc6a4..79cc84d79 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -1,5 +1,5 @@
 es:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Agregado por primera vez'
     HEIGHT: Alto
     LASTEDIT: 'Modificado por última vez'
@@ -11,7 +11,7 @@ es:
     ENTERINFO: 'Por favor introduzca su nombre de usuario y contraseña.'
     ERRORNOTADMIN: 'Ese usuario no es un administrador.'
     ERRORNOTREC: 'Ese nombre de usuario / contraseña no pudo ser reconocido.'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Cualquiera
     NOANSWER: 'No'
     YESANSWER: Sí
@@ -27,15 +27,15 @@ es:
     SUCCESSCONTENT: '<p>Inicio de sesión exitoso. Si Ud no es automáticamente redireccionado, <a target="_top" href="{link}">haga clic aquí</a></p>'
     TimedOutTitleAnonymous: 'Expiró su sesión.'
     TimedOutTitleMember: 'Eh {name}!<br />Tu sesión expiró.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDFOREMAIL: 'Se ha cambiado la contraseña de la cuenta con dirección de correo electrónico {email}. Si no cambió su contraseña, por favor cambie su contraseña usando el siguiente enlace'
-    CHANGEPASSWORDTEXT1: 'Has cambiado tu contraseña por'
-    CHANGEPASSWORDTEXT3: 'Cambiar contraseña'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hola
+    TEXT1: 'Aquí tiene su'
+    TEXT2: 'enlace para restablecer contraseña'
+    TEXT3: para
   SilverStripe\Forms\CheckboxField:
     NOANSWER: 'No'
     YESANSWER: Sí
-  CheckboxSetField_ss:
+  SilverStripe\Forms\CheckboxSetField.ss:
     NOOPTIONSAVAILABLE: 'No hay opciones disponibles'
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Las constraseñas deben tener al menos {min} caracteres de longitud.'
@@ -47,10 +47,25 @@ es:
     SHOWONCLICKTITLE: 'Cambiar contraseña'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: Símbolo
-  Date:
-    LessThanMinuteAgo: 'Hace menos de un minuto'
-    TIMEDIFFAGO: 'hace {difference}'
-    TIMEDIFFIN: 'en {difference}'
+  SilverStripe\ORM\FieldType\DBDate:
+    DAYS_SHORT_PLURALS:
+      one: '{count} día'
+      other: '{count} días'
+    HOURS_SHORT_PLURALS:
+      one: '{count} hora'
+      other: '{count} horas'
+    MINUTES_SHORT_PLURALS:
+      one: '{count} minuto'
+      other: '{count} minutos'
+    MONTHS_SHORT_PLURALS:
+      one: '{count} mes'
+      other: '{count} meses'
+    SECONDS_SHORT_PLURALS:
+      one: '{count} segundo'
+      other: '{count} segundos'
+    YEARS_SHORT_PLURALS:
+      one: '{count} año'
+      other: '{count} años'
   SilverStripe\Forms\DateField:
     NOTSET: 'sin establecer'
     TODAY: hoy
@@ -65,13 +80,8 @@ es:
     SOURCE_VALIDATION: 'Por favor, seleccionar un valor dentro de la lista provista. {value} no es una opcion válida'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Introduzca una dirección de correo electrónico'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Cualquiera
-  ForgotPasswordEmail_ss:
-    HELLO: Hola
-    TEXT1: 'Aquí tiene su'
-    TEXT2: 'enlace para restablecer contraseña'
-    TEXT3: para
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Tu sesión ha expirado. Por favor re envíe el formulario'
     CSRF_FAILED_MESSAGE: 'Parece que hubo un problema técnico. Por favor, haga clic en el botón Volver, recargue su navegador y vuelva a intentarlo.'
@@ -84,27 +94,11 @@ es:
   SilverStripe\Forms\FormField:
     EXAMPLE: 'p.ej. {format}'
     NONE: ninguna
-  GridAction:
-    DELETE_DESCRIPTION: Borrar
-    Delete: Borrar
-    UnlinkRelation: Desenlazar
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Añadir {name}'
-    Filter: Filtro
-    FilterBy: 'Filtrar por'
-    Find: Buscar
-    LinkExisting: 'Enlace Existente'
-    NewRecord: 'Nuevo %s'
-    NoItemsFound: 'No se encontraron registros'
-    PRINTEDAT: 'Impreso en'
-    PRINTEDBY: 'Impreso por'
-    PlaceHolder: 'Buscar {type}'
-    PlaceHolderWithLabels: 'Buscar {type} por {name}'
-    RelationSearch: 'Búsqueda de relación'
-    ResetFilter: Restaurar
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Sin permiso para borrar'
     EditPermissionsFailure: 'No se pudo editar permisos'
+  SilverStripe\Forms\GridField\GridField:
+    OF: de
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Cancelar
     Create: Crear
@@ -112,7 +106,7 @@ es:
     DeletePermissionsFailure: 'Sin permiso para borrar'
     Deleted: 'Borrado %s %s'
     Save: Guardar
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Editar
   SilverStripe\Security\Group:
     PLURALNAME: Grupos
@@ -200,7 +194,7 @@ es:
     IsNullLabel: 'Es Nulo'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' no es un número, sólo números pueden ser aceptados para este campo'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Página
     View: Vista
   SilverStripe\Security\PasswordValidator:
@@ -208,11 +202,7 @@ es:
     PREVPASSWORD: 'Ya habías utilizado esa contraseña en el pasado, por favor usa uno nuevo'
     TOOSHORT: 'Tu contraseña es muy corta'
   SilverStripe\Security\Permission:
-    PLURALNAME: Permisos
-    PLURALS:
-      one: 'Un Permiso'
-      other: '{count} Permisos'
-    SINGULARNAME: Permiso
+    UserPermissionsIntro: 'Asignar grupos a este usuario ajustará los permisos que tienen. Vea la sección de grupos para obtener información sobre permisos en grupos individuales.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'asignado a "{title}"'
     FromGroup: 'heredado desde el grupo "{title}"'
@@ -230,8 +220,6 @@ es:
       one: 'Un Código de Rol de Permiso'
       other: '{count} Códigos de Roles de Permiso'
     SINGULARNAME: 'Código del Rol de Permiso'
-  Permissions:
-    UserPermissionsIntro: 'Asignar grupos a este usuario ajustará los permisos que tienen. Vea la sección de grupos para obtener información sobre permisos en grupos individuales.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Por favor introduzca un número de teléfono válido'
   SilverStripe\Security\Security:
@@ -261,25 +249,6 @@ es:
       one: 'Un Objeto de Dato'
       other: '{count} Objetos de Datos'
     SINGULARNAME: 'Objeto de Dato'
-  SilverStripe\ORM\FieldType\DBDate:
-    DAYS_SHORT_PLURALS:
-      one: '{count} día'
-      other: '{count} días'
-    HOURS_SHORT_PLURALS:
-      one: '{count} hora'
-      other: '{count} horas'
-    MINUTES_SHORT_PLURALS:
-      one: '{count} minuto'
-      other: '{count} minutos'
-    MONTHS_SHORT_PLURALS:
-      one: '{count} mes'
-      other: '{count} meses'
-    SECONDS_SHORT_PLURALS:
-      one: '{count} segundo'
-      other: '{count} segundos'
-    YEARS_SHORT_PLURALS:
-      one: '{count} año'
-      other: '{count} años'
   SilverStripe\Security\MemberPassword:
     PLURALNAME: 'Contraseñas de los Miembros'
     PLURALS:
@@ -294,15 +263,9 @@ es:
     SINGULARNAME: 'Hash de inicio de sesión'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principal
-  TableListField:
-    CSVEXPORT: 'Exportar a CSV'
-    CSVIMPORT: 'Importar CSV'
-    Print: Imprimir
-  TableListField_PageControls_ss:
-    OF: de
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Por favor, introduzca un formato de tiempo válido ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensiones
     EDIT: Editar
     EDITINFO: 'Editar este archivo'
diff --git a/lang/es_AR.yml b/lang/es_AR.yml
index eedff6747..355709377 100644
--- a/lang/es_AR.yml
+++ b/lang/es_AR.yml
@@ -1,5 +1,5 @@
 es_AR:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Agregado por primera vez'
     LASTEDIT: 'Modificado por última vez'
     SIZE: Tamaño
@@ -8,11 +8,13 @@ es_AR:
     ENTERINFO: 'Por favor ingresa tu nombre de usuario y contraseña.'
     ERRORNOTADMIN: 'El usuario no es administrador.'
     ERRORNOTREC: 'No se reconoce el nombre de usuario / contraseña'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Cualquiera
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Haz cambiado tu contraseña por'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hola
+    TEXT1: 'Aquí esta tu'
+    TEXT2: 'vínculo para restablecer la contraseña'
+    TEXT3: para
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Cambiar Contraseña'
   SilverStripe\Forms\DateField:
@@ -20,13 +22,8 @@ es_AR:
     TODAY: hoy
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Selecciona)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Cualquiera
-  ForgotPasswordEmail_ss:
-    HELLO: Hola
-    TEXT1: 'Aquí esta tu'
-    TEXT2: 'vínculo para restablecer la contraseña'
-    TEXT3: para
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Las contraseñas no son iguales'
     VALIDATIONPASSWORDSNOTEMPTY: 'Las contraseñas no pueden estar vacías'
@@ -107,5 +104,5 @@ es_AR:
     ROLESDESCRIPTION: 'Esta sección le permite agregar roles a este grupo. Los roles son agrupaciones lógicas de permisos, que se pueden editar en la pestaña Roles.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principal
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'Exportar a CSV'
diff --git a/lang/es_MX.yml b/lang/es_MX.yml
index f5235a304..99af69273 100644
--- a/lang/es_MX.yml
+++ b/lang/es_MX.yml
@@ -1,5 +1,5 @@
 es_MX:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Agregado por primera vez'
     LASTEDIT: 'Modificado por última vez'
     SIZE: Tamaño
@@ -8,14 +8,16 @@ es_MX:
     ENTERINFO: 'Por favor ingresa tu nombre de usuario y contraseña.'
     ERRORNOTADMIN: 'El usuario no es administrador.'
     ERRORNOTREC: 'No se reconoce el nombre de usuario / contraseña'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Cualquiera
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Usted ha cambiado su contraseña'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hey
+    TEXT1: 'Estás aquí'
+    TEXT2: 'vínculo para restablecer la contraseña'
+    TEXT3: para
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Cambiar contraseña'
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     TIMEDIFFAGO: '{difference} atrás'
     TIMEDIFFIN: 'en {difference}'
   SilverStripe\Forms\DateField:
@@ -28,38 +30,18 @@ es_MX:
     INVALID_REQUEST: 'Solicitud no válida'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Seleccione)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Cualquiera
-  ForgotPasswordEmail_ss:
-    HELLO: Hey
-    TEXT1: 'Estás aquí'
-    TEXT2: 'vínculo para restablecer la contraseña'
-    TEXT3: para
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Las contraeñas no son iguales'
     VALIDATIONPASSWORDSNOTEMPTY: 'Las contraseñas no pueden estar vacías'
     VALIDATOR: Verificador
   SilverStripe\Forms\FormField:
     NONE: Ninguno
-  GridAction:
-    Delete: Eliminar
-    UnlinkRelation: Desvincular
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Agregar {name}'
-    Filter: Filtro
-    FilterBy: 'Filtrar por'
-    Find: Buscar
-    LinkExisting: 'Enlazar existente'
-    NewRecord: 'Nuevo %s'
-    NoItemsFound: 'No hay ítems encontrados'
-    PRINTEDAT: 'Impreso en'
-    PRINTEDBY: 'Imprimir por'
-    PlaceHolder: 'Buscar {type}'
-    PlaceHolderWithLabels: 'Buscar {type} por {name}'
-    RelationSearch: 'Buscar relación'
-    ResetFilter: Resetear
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'No borrar permisos'
+  SilverStripe\Forms\GridField\GridField:
+    CSVEXPORT: 'Exportar a CSV'
   SilverStripe\Security\Group:
     Code: 'Código del grupo'
     DefaultGroupTitleAdministrators: Administradores
@@ -151,11 +133,9 @@ es_MX:
     PERMISSIONS: Permisos
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principal
-  TableListField:
-    CSVEXPORT: 'Exportar a CSV'
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Por favor ingresar un formato válido de fecha ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensiones
     EDITINFO: 'Editar este archivo'
     FIELDNOTSET: 'Información acerca del archivo no encontrada'
diff --git a/lang/et_EE.yml b/lang/et_EE.yml
index 4ede68a04..e1deb25be 100644
--- a/lang/et_EE.yml
+++ b/lang/et_EE.yml
@@ -1,5 +1,5 @@
 et_EE:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Esmakordselt üles laaditud'
     LASTEDIT: 'Viimati muudetud'
     SIZE: Failisuurus
@@ -9,13 +9,14 @@ et_EE:
     ENTERINFO: 'Palun sisesta kasutajanimi ja parool.'
     ERRORNOTADMIN: 'Antud kasutaja ei ole administraator.'
     ERRORNOTREC: 'See kasutajanimi / parool ei ole tunnustatud'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Kõik
     NOANSWER: Ei
     YESANSWER: Jah
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Vahetasid oma parooli lehel'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Tere
+    TEXT1: 'Siin on sinu'
+    TEXT2: 'Parooli tühistus link'
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Ei
     YESANSWER: Jah
@@ -24,7 +25,7 @@ et_EE:
     BETWEEN: 'Parooli pikkus peab olema vahemikus {min}–{max} märki.'
     MAXIMUM: 'Parool võib olla kuni {max} märki pikk.'
     SHOWONCLICKTITLE: 'Muuda parool'
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'vähem kui minut'
     TIMEDIFFAGO: tagasi
   SilverStripe\Forms\DateField:
@@ -39,12 +40,8 @@ et_EE:
     CHOOSE: (Vali)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Sisestage e-posti aadress'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Kõik
-  ForgotPasswordEmail_ss:
-    HELLO: Tere
-    TEXT1: 'Siin on sinu'
-    TEXT2: 'Parooli tühistus link'
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Paroolid ei katu'
     VALIDATIONPASSWORDSNOTEMPTY: 'Paroolid ei saa olla tühjad'
@@ -53,25 +50,10 @@ et_EE:
     VALIDCURRENCY: 'Sisestage kehtiv valuuta'
   SilverStripe\Forms\FormField:
     NONE: puudub
-  GridAction:
-    DELETE_DESCRIPTION: Kustuta
-    Delete: Kustuta
-    UnlinkRelation: 'Tühista linkimine'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Lisa {name}'
-    Filter: Filtreeri
-    FilterBy: Filtreerimisalus
-    Find: Otsi
-    LinkExisting: 'Lingi olemasolev'
-    NewRecord: 'Uus %s'
-    NoItemsFound: 'Üksusi ei leitud'
-    PRINTEDAT: 'Printimiskoht:'
-    PRINTEDBY: Printis
-    PlaceHolder: 'Leia {type}'
-    RelationSearch: 'Seose otsing'
-    ResetFilter: Lähtesta
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Kustutamisõigused puuduvad'
+  SilverStripe\Forms\GridField\GridField:
+    OF: /
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Loobu
     Create: Loo
@@ -79,7 +61,7 @@ et_EE:
     DeletePermissionsFailure: 'Kustutamisõigused puuduvad'
     Deleted: '%s %s on kustutatud'
     Save: Salvesta
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Redigeeri
   SilverStripe\Security\Group:
     AddRole: 'Lisa selle grupi jaoks rolle'
@@ -148,12 +130,11 @@ et_EE:
     IsNullLabel: 'On tühi'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' ei ole number, sellele väljale võib sisestada ainult numbreid'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Leht
     View: Kuva
   SilverStripe\Security\Permission:
-    AdminGroup: Administraator
-    FULLADMINRIGHTS: 'Täielikud administraatoriõigused'
+    UserPermissionsIntro: 'Sellele kasutajale gruppide määramine kohandab tema õiguseid. Vaadake gruppide jaotist, et näha üksikasju iga grupi õiguste kohta.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'määratud grupile "{title}"'
     FromGroup: 'päritud grupilt "{title}"'
@@ -162,8 +143,6 @@ et_EE:
   SilverStripe\Security\PermissionRole:
     OnlyAdminCanApply: 'Ainult administraator saab rakendada'
     Title: Pealkiri
-  Permissions:
-    UserPermissionsIntro: 'Sellele kasutajale gruppide määramine kohandab tema õiguseid. Vaadake gruppide jaotist, et näha üksikasju iga grupi õiguste kohta.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Sisestage kehtiv telefoninumber'
   SilverStripe\Security\Security:
@@ -188,14 +167,9 @@ et_EE:
     ROLESDESCRIPTION: 'Rollid on eelmäratud õiguste kogumid, mida on võimalik määrara gruppidele.<br />Need päritakse vajaduse korral vanemgruppidest.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Avaleht
-  TableListField:
-    CSVEXPORT: 'Ekspordi CSV-vormingusse'
-    Print: Prindi
-  TableListField_PageControls_ss:
-    OF: /
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Sisestage sobivas vormingus kellaaeg ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Mõõtmed
     EDIT: Muuda
     EDITINFO: 'Muuda seda faili'
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index e98e12755..3f9f82614 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -1,5 +1,5 @@
 fa_IR:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'نخستین بارگذاری'
     HEIGHT: ارتفاع
     LASTEDIT: 'آخرین تغییرات'
@@ -11,7 +11,7 @@ fa_IR:
     ENTERINFO: 'لطفاً یک نام‌کاربری و گذرواژه را وارد نمایید.'
     ERRORNOTADMIN: 'این کاربر یک مدیر نیست.'
     ERRORNOTREC: 'این نام کاربری / گذرواژه شناخته‌شده نیست'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: هر
     NOANSWER: خیر
     YESANSWER: بله
@@ -27,10 +27,11 @@ fa_IR:
     SUCCESSCONTENT: '<p>ورود موفق. اگر به‌طور خودکار ارجاع نشدید <a target="_top" href="{link}">اینجا را کلیک کنید.</a></p>'
     TimedOutTitleAnonymous: 'جلسه شما به پایان رسیده است.'
     TimedOutTitleMember: 'سلام {name}!<br />زمان جلسه شما به پایان رسیده است.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'شما گذرواژه‌تان را تغییر دادید برای'
-    CHANGEPASSWORDTEXT3: 'تغییر گذرواژه'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: درود
+    TEXT1: 'شما اینجاست'
+    TEXT2: 'لینک ازنوسازی گذرواژه'
+    TEXT3: برای
   SilverStripe\Forms\CheckboxField:
     NOANSWER: خیر
     YESANSWER: بله
@@ -44,7 +45,7 @@ fa_IR:
     SHOWONCLICKTITLE: 'تغییر گذرواژه'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: ﷼
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'کمتر از یک دقیقه'
     TIMEDIFFAGO: '{difference} پیش'
     TIMEDIFFIN: 'در {difference}'
@@ -61,13 +62,8 @@ fa_IR:
     SOURCE_VALIDATION: 'لطفاً یک ارزش از لیست فراهم‌شده برگزینید. {value} یک گزینه معتبر نیست'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'لطفاً یک نشانی ایمیل وارد نمایید'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: هر
-  ForgotPasswordEmail_ss:
-    HELLO: درود
-    TEXT1: 'شما اینجاست'
-    TEXT2: 'لینک ازنوسازی گذرواژه'
-    TEXT3: برای
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'جلسه شما به پایان رسیده است. لطفاً فرم را مجدداً ارسال کنید.'
     CSRF_FAILED_MESSAGE: 'به‌نظر می‌آید یک نقص فنی به‌وجود آمده‌است. لطفاً بر روی دکمه‌ی بازگشت کلیک کنید، در مرورگر خود دکمه‌ی ازنو را بزنید، و مجدداً تلاش نمایید.'
@@ -78,27 +74,11 @@ fa_IR:
     VALIDCURRENCY: 'لطفاً یک واحد پول معتبر وارد نمایید'
   SilverStripe\Forms\FormField:
     NONE: 'هیچ‌کدام'
-  GridAction:
-    DELETE_DESCRIPTION: حذف
-    Delete: حذف
-    UnlinkRelation: 'حذف لینک'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'افزودن {name}'
-    Filter: پالایش
-    FilterBy: 'پالایش براساس'
-    Find: بگرد
-    LinkExisting: 'لینک موجود'
-    NewRecord: '%s جدید'
-    NoItemsFound: 'هیچ آیتمی یافت نشد'
-    PRINTEDAT: 'پرینت‌شده در'
-    PRINTEDBY: 'پرینت‌شده توسط'
-    PlaceHolder: 'یافتن {type}'
-    PlaceHolderWithLabels: 'یافتن {type} از روی {name}'
-    RelationSearch: 'جستجوی رابط'
-    ResetFilter: 'از نو'
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'دسترسی‌های حذف وجود ندارد'
     EditPermissionsFailure: 'دسترسی‌های حذف لینک وجود ندارد'
+  SilverStripe\Forms\GridField\GridField:
+    OF: از
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: لغو
     Create: ایجاد
@@ -106,7 +86,7 @@ fa_IR:
     DeletePermissionsFailure: 'دسترسی‌های حذف وجود ندارد'
     Deleted: 'حذف شده %s %s'
     Save: ذخیره
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: ویرایش
   SilverStripe\Security\Group:
     PLURALNAME: گروه‌ها
@@ -160,7 +140,7 @@ fa_IR:
     FIELDLABELCURRENCY: 'واحد پول'
   SilverStripe\Forms\NullableField:
     IsNullLabel: 'خالی است'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: صفحه
     View: 'نمایش'
   SilverStripe\Security\PasswordValidator:
@@ -198,14 +178,9 @@ fa_IR:
     SINGULARNAME: 'گذرواژه کاربر'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: اصلی
-  TableListField:
-    CSVEXPORT: 'خروجی‌گیری به CSV'
-    Print: چاپ
-  TableListField_PageControls_ss:
-    OF: از
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'لطفاً یک قالب زمان معتبر وارد نمایید ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: ابعاد
     EDIT: ویرایش
     EDITINFO: 'ویرایش این فایل'
diff --git a/lang/fi.yml b/lang/fi.yml
index 4b18b7b16..4c6fb06f9 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -1,5 +1,5 @@
 fi:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Ensimmäisen kerran ladattu palvelimelle'
     HEIGHT: Korkeus
     LASTEDIT: 'Viimeksi muokattu'
@@ -11,7 +11,7 @@ fi:
     ENTERINFO: 'Anna käyttäjänimi ja salasana'
     ERRORNOTADMIN: 'Tämä käyttäjä ei ole ylläpitäjä'
     ERRORNOTREC: 'Tätä käyttäjänimeä/salasanaa ei tunnistettu.'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Yhtään
     NOANSWER: Ei
     YESANSWER: Kyllä
@@ -27,11 +27,11 @@ fi:
     SUCCESSCONTENT: '<p>Kirjautuminen onnistui. Mikäli automaattinen edelleenohjaus ei toimi <a target="_top" href="{link}">klikkaa tästä</a></p>'
     TimedOutTitleAnonymous: 'Istuntosi on vanhentunut.'
     TimedOutTitleMember: 'Hei {name}!<br />Istuntosi on vanhentunut.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDFOREMAIL: 'Tilin salasana on vaihdettu. Sähköpostiosoite on {email}. Mikäli et pyytänyt salasanan vaihtoa, vaihda salasanasi alla olevasta linkistä'
-    CHANGEPASSWORDTEXT1: 'Vaihdoit salasanasi osoitteelle'
-    CHANGEPASSWORDTEXT3: 'Vaihda salasana'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hei
+    TEXT1: 'Tässä on sinun'
+    TEXT2: 'salasanan vaihtolinkki'
+    TEXT3: kohteeseen
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Ei
     YESANSWER: Kyllä
@@ -45,7 +45,7 @@ fi:
     SHOWONCLICKTITLE: 'Vaihda salasana'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'alle minuutti'
     TIMEDIFFAGO: '{difference} sitten'
     TIMEDIFFIN: '&raquo; {difference}'
@@ -63,13 +63,8 @@ fi:
     SOURCE_VALIDATION: 'Valitse arvo pudotusvalikosta. {value} ei kelpaa'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Anna sähköpostiosoite, ole hyvä.'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Yhtään
-  ForgotPasswordEmail_ss:
-    HELLO: Hei
-    TEXT1: 'Tässä on sinun'
-    TEXT2: 'salasanan vaihtolinkki'
-    TEXT3: kohteeseen
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Istuntosi on umpeutunut. Lähetä lomake uudelleen.'
     CSRF_FAILED_MESSAGE: 'On ilmeisesti tapahtunut tekninen virhe. Klikkaa selaimesi Takaisin-nappia, päivitä sivu ja yritä uudelleen.'
@@ -81,27 +76,11 @@ fi:
     VALIDCURRENCY: 'Ole hyvä ja valitse voimassa oleva valuutta'
   SilverStripe\Forms\FormField:
     NONE: 'Ei yhtään'
-  GridAction:
-    DELETE_DESCRIPTION: Poista
-    Delete: Poista
-    UnlinkRelation: 'Pura linkitys'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Lisää {name}'
-    Filter: Suodatin
-    FilterBy: 'Suodata &raquo;'
-    Find: Etsi
-    LinkExisting: 'Linkitä olemassaoleva'
-    NewRecord: 'Uusi %s'
-    NoItemsFound: 'Ei kohteita'
-    PRINTEDAT: Tulostettu
-    PRINTEDBY: Tulostaja
-    PlaceHolder: 'Etsi {type}'
-    PlaceHolderWithLabels: 'Etsi {type} &raquo; {name}'
-    RelationSearch: Relaatiohaku
-    ResetFilter: Nollaa
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Ei oikeuksia poistamiseen'
     EditPermissionsFailure: 'Ei oikeuksia purkaa linkitystä tietueeseen'
+  SilverStripe\Forms\GridField\GridField:
+    OF: /
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Peruuta
     Create: Luo
@@ -109,7 +88,7 @@ fi:
     DeletePermissionsFailure: 'Ei oikeuksia poistamiseen'
     Deleted: 'Poistettiin %s %s'
     Save: Tallenna
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Muokkaa
   SilverStripe\Security\Group:
     PLURALNAME: Ryhmät
@@ -187,7 +166,7 @@ fi:
     IsNullLabel: 'On nolla'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' ei ole numero: tähän kenttään hyväksytään vain numeroita'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Sivu
     View: Näytä
   SilverStripe\Security\PasswordValidator:
@@ -195,8 +174,7 @@ fi:
     PREVPASSWORD: 'Olet jo käyttänyt tätä salasanaa aikaisemmin, ole hyvä ja valitse uusi'
     TOOSHORT: 'Salasanan on oltava vähintään %s merkkiä'
   SilverStripe\Security\Permission:
-    PLURALNAME: Oikeudet
-    SINGULARNAME: Oikeus
+    UserPermissionsIntro: 'Määriteltäessä käyttäjälle ryhmä, hänen käyttöoikeutensa mukautuvat ryhmälle tehtyjen asetusten mukaisesti. Katso tarkemmat ryhmäkohtaiset käyttöoikeusasetukset Ryhmät-välilehdeltä.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'valittiin "{title}"'
     FromGroup: 'periytyivät ryhmästä "{title}"'
@@ -208,8 +186,6 @@ fi:
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: 'Käyttöoikeuden roolin koodit'
     SINGULARNAME: 'Käyttöoikeuden roolin koodi'
-  Permissions:
-    UserPermissionsIntro: 'Määriteltäessä käyttäjälle ryhmä, hänen käyttöoikeutensa mukautuvat ryhmälle tehtyjen asetusten mukaisesti. Katso tarkemmat ryhmäkohtaiset käyttöoikeusasetukset Ryhmät-välilehdeltä.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Kirjoita pätevä puhelinnumero'
   SilverStripe\Security\Security:
@@ -241,15 +217,9 @@ fi:
     SINGULARNAME: 'Käyttäjän salasana'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Yleiset
-  TableListField:
-    CSVEXPORT: 'Vie CSV:nä'
-    CSVIMPORT: 'Tuo CSV'
-    Print: Tulosta
-  TableListField_PageControls_ss:
-    OF: /
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Ole hyvä ja kirjaa päivämäärä sallitussa muodossa ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Mitat
     EDIT: Muokkaa
     EDITINFO: 'Muokkaa tätä tiedostoa'
diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml
index 29cdbdccb..aa14b277f 100644
--- a/lang/fi_FI.yml
+++ b/lang/fi_FI.yml
@@ -1,5 +1,5 @@
 fi_FI:
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     NOANSWER: Ei
     YESANSWER: Kyllä
   SilverStripe\Forms\CheckboxField:
diff --git a/lang/fo.yml b/lang/fo.yml
index f6840be65..a5933f15a 100644
--- a/lang/fo.yml
+++ b/lang/fo.yml
@@ -1,5 +1,5 @@
 fo:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     LASTEDIT: 'Seinast broyting'
     SIZE: Stødd
     TYPE: Slag
@@ -7,9 +7,9 @@ fo:
     ENTERINFO: 'Vinarliga inntøppa eitt brúkaranavn og loyniorð.'
     ERRORNOTADMIN: 'Hasin brúkarin er ikki ein fyrisitari.'
     ERRORNOTREC: 'Brúkaranavn / loyniorð er skeivt'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Tú broytti loyniorðið hjá'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hey
+    TEXT1: 'Her er títt'
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Broyt loyniorð'
   SilverStripe\Forms\DateField:
@@ -17,9 +17,6 @@ fo:
     TODAY: 'í dag'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Áset)
-  ForgotPasswordEmail_ss:
-    HELLO: Hey
-    TEXT1: 'Her er títt'
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Loyniorð samsvara ikki'
     VALIDATIONPASSWORDSNOTEMPTY: 'Loyniorð kunnu ikki verða tóm'
@@ -76,5 +73,5 @@ fo:
     PERMISSIONS: Rættindi
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Alment
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'Útles til CSV'
diff --git a/lang/fr.yml b/lang/fr.yml
index af282c99c..1750222c0 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -1,5 +1,5 @@
 fr:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Premier chargement'
     HEIGHT: Hauteur
     LASTEDIT: 'Dernière modification'
@@ -10,11 +10,13 @@ fr:
     ENTERINFO: 'Entrer un identifiant et un mot de passe s''il vous plaît.'
     ERRORNOTADMIN: 'Cet utilisateur n''est pas un administrateur.'
     ERRORNOTREC: 'Cet identifiant / mot de passe n''est pas reconnu'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Tout
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Vous avez modifié votre mot de passe pour'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Salut
+    TEXT1: 'Voici votre'
+    TEXT2: 'lien de réinitialisation de mot de passe'
+    TEXT3: pour
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Le mot de passe doit comporter au moins {min} caractères.'
     BETWEEN: 'Le mot de passe doit comporter entre {min} et {max} caractères.'
@@ -23,7 +25,7 @@ fr:
     SHOWONCLICKTITLE: 'Changer le mot de passe'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'moins d''une minute'
     TIMEDIFFAGO: 'Il y a {difference}'
     TIMEDIFFIN: 'Dans {difference}'
@@ -39,13 +41,8 @@ fr:
     CHOOSE: (Choisir)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Saisissez une adresse de courrier électronique'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Tous
-  ForgotPasswordEmail_ss:
-    HELLO: Salut
-    TEXT1: 'Voici votre'
-    TEXT2: 'lien de réinitialisation de mot de passe'
-    TEXT3: pour
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Les mots de passe ne correspondent pas'
     VALIDATIONPASSWORDSNOTEMPTY: 'Les mots de passe peuvent être vides'
@@ -54,27 +51,11 @@ fr:
     VALIDCURRENCY: 'Saisissez une monnaie valide'
   SilverStripe\Forms\FormField:
     NONE: aucun
-  GridAction:
-    DELETE_DESCRIPTION: Supprime
-    Delete: Supprimer
-    UnlinkRelation: Séparer
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Ajouter {name}'
-    Filter: Filtrer
-    FilterBy: 'Filtrer par'
-    Find: Trouver
-    LinkExisting: 'Lien existant'
-    NewRecord: 'Nouveau %s'
-    NoItemsFound: 'Aucun élément n’a été trouvé.'
-    PRINTEDAT: 'Imprimé le'
-    PRINTEDBY: 'Imprimé par'
-    PlaceHolder: 'Rechercher {type}'
-    PlaceHolderWithLabels: 'Rechercher {type} par {name}'
-    RelationSearch: 'Rechercher relations'
-    ResetFilter: Réinitialiser
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
     EditPermissionsFailure: 'Pas de permissions pour délier l''enregistrement'
+  SilverStripe\Forms\GridField\GridField:
+    OF: de
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Annuler
     Create: Créer
@@ -82,7 +63,7 @@ fr:
     DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
     Deleted: '%s %s supprimés'
     Save: Enregistrer
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Editer
   SilverStripe\Security\Group:
     AddRole: 'Ajouter un rôle pour ce groupe'
@@ -158,7 +139,7 @@ fr:
     IsNullLabel: 'Est Null'
   SilverStripe\Forms\NumericField:
     VALIDATION: "«\_{value}\_» n’est pas un chiffre, seule donnée acceptée dans ce champ "
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Page
     View: Afficher
   SilverStripe\Security\PasswordValidator:
@@ -166,9 +147,7 @@ fr:
     PREVPASSWORD: 'Vous avez déjà utilisé ce mot de passe par le passé, veuillez en choisir un autre'
     TOOSHORT: 'Le mot de passe est trop court, il doit contenir au moins %s caractères'
   SilverStripe\Security\Permission:
-    AdminGroup: Administrateur
-    FULLADMINRIGHTS: 'Droits d''administration complets'
-    FULLADMINRIGHTS_HELP: 'Implique et prévaut sur toutes les autres autorisations assignées.'
+    UserPermissionsIntro: "Assigner des groupes à cet utilisateur modifiera les autorisations dont il dispose. Consultez la section «\_Groupes\_» pour plus de détails sur les autorisations associées à chaque groupe."
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'assignée au groupe « {title} »'
     FromGroup: "hérité du groupe «\_{title}\_»"
@@ -177,8 +156,6 @@ fr:
   SilverStripe\Security\PermissionRole:
     OnlyAdminCanApply: 'Limité aux administrateurs'
     Title: Titre
-  Permissions:
-    UserPermissionsIntro: "Assigner des groupes à cet utilisateur modifiera les autorisations dont il dispose. Consultez la section «\_Groupes\_» pour plus de détails sur les autorisations associées à chaque groupe."
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Entrer un numéro de téléphone valide'
   SilverStripe\Security\Security:
@@ -203,14 +180,9 @@ fr:
     ROLESDESCRIPTION: 'Les rôles sont des regroupements logiques d’autorisations qui peuvent être assignés à des groupes.<br />Ils peuvent être hérités de groupes parents, si nécessaire.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principal
-  TableListField:
-    CSVEXPORT: 'Exporter vers un fichier CSV'
-    Print: Imprimer
-  TableListField_PageControls_ss:
-    OF: de
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Saisissez l’heure au format valide ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensions
     EDIT: Modifier
     EDITINFO: 'Modifier ce fichier'
diff --git a/lang/gl_ES.yml b/lang/gl_ES.yml
index 9b3cec6b3..02e8b9361 100644
--- a/lang/gl_ES.yml
+++ b/lang/gl_ES.yml
@@ -1,5 +1,5 @@
 gl_ES:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Primeiro subido'
     LASTEDIT: 'Último cambio'
     SIZE: 'Tamaño ficheiro'
@@ -8,10 +8,13 @@ gl_ES:
     ENTERINFO: 'Por favor insire un nome de usuario e contrasinal.'
     ERRORNOTADMIN: 'Ese usuario non é un administrador.'
     ERRORNOTREC: 'Ese nome de usuario/contrasinal non é recoñecido'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Ningún
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Mudaches o teu contrasinal por'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
+    HELLO: Ola
+    TEXT1: 'Estás aquí'
+    TEXT2: 'ligazón de reinicio do contrasinal'
+    TEXT3: para
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Mudar Contrasinal'
   SilverStripe\Forms\CurrencyField:
@@ -20,34 +23,18 @@ gl_ES:
     NOTSET: 'sen establecer'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Escoller)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Ningún
-  ForgotPasswordEmail_ss:
-    HELLO: Ola
-    TEXT1: 'Estás aquí'
-    TEXT2: 'ligazón de reinicio do contrasinal'
-    TEXT3: para
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Os contrasinais non emparellan'
     VALIDATIONPASSWORDSNOTEMPTY: 'Os contrasinais non pode ser baleiro'
     VALIDATOR: Validador
   SilverStripe\Forms\FormField:
     NONE: ningún
-  GridAction:
-    Delete: Eliminar
-    UnlinkRelation: Desligar
-  SilverStripe\Forms\GridField\GridField:
-    Filter: Filtro
-    Find: Atopar
-    LinkExisting: 'Ligazón existente'
-    NewRecord: 'Novo %s'
-    NoItemsFound: 'Ningún elemento atopado'
-    PRINTEDAT: 'Impreso ás'
-    PRINTEDBY: 'Impreso por'
-    RelationSearch: 'Busca relacionada'
-    ResetFilter: Reiniciar
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Non eliminar permisos'
+  SilverStripe\Forms\GridField\GridField:
+    CSVEXPORT: 'Exportar a CSV'
   SilverStripe\Security\Group:
     AddRole: 'Engadir un role para este grupo'
     Code: 'Código de Grupo'
@@ -133,8 +120,6 @@ gl_ES:
     ROLESDESCRIPTION: 'Os roles son conxuntos de permisos predefinidos, e poden ser asinados a grupos.<br />Poden ser herdados dos grupos pai si requeridos.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principal
-  TableListField:
-    CSVEXPORT: 'Exportar a CSV'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     EDITINFO: 'Editar este ficheiro'
     FIELDNOTSET: 'Ficheiro de información non atopado'
diff --git a/lang/he_IL.yml b/lang/he_IL.yml
index 1287e17d9..e5d1217b8 100644
--- a/lang/he_IL.yml
+++ b/lang/he_IL.yml
@@ -1,5 +1,5 @@
 he_IL:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'הועלה לראשונה'
     LASTEDIT: 'שונה לאחרונה'
     SIZE: גודל
@@ -9,15 +9,12 @@ he_IL:
     ENTERINFO: 'נא הכנס שם משתמש וסיסמא'
     ERRORNOTADMIN: 'משתמש זה אינו מנהל'
     ERRORNOTREC: 'שם המשתמש / סיסמא לא מזוהה'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'שינית את הסיסמא עבור'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: היי
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'שינוי סיסמה'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (בחר)
-  ForgotPasswordEmail_ss:
-    HELLO: היי
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'הסיסמאות לא תואמות'
     VALIDATIONPASSWORDSNOTEMPTY: 'הסיסמאות לא יכול להיות ריקות'
diff --git a/lang/hi.yml b/lang/hi.yml
index 5b8157ff5..2c675a682 100644
--- a/lang/hi.yml
+++ b/lang/hi.yml
@@ -1,5 +1,5 @@
 hi:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     HEIGHT: लंबाई
     WIDTH: चौड़ाई
   SilverStripe\Security\BasicAuth:
diff --git a/lang/hr.yml b/lang/hr.yml
index ed4e350a2..b4b0bbd88 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -1,5 +1,5 @@
 hr:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: Uploadano
     HEIGHT: Visina
     LASTEDIT: 'Zadnja promjena'
@@ -11,7 +11,7 @@ hr:
     ENTERINFO: 'Unesite korisničko ime i lozinu'
     ERRORNOTADMIN: 'Korisnik nije administrator'
     ERRORNOTREC: 'Korisničko ime / lozinka nije prepoznata'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Bilo koji'
     NOANSWER: Ne
     YESANSWER: Da
@@ -21,10 +21,11 @@ hr:
     SUCCESS: Uspjeh
     TimedOutTitleAnonymous: 'Vaša sesija je istekla.'
     TimedOutTitleMember: 'Bok {name}!<br />Vaša sesija je istekla.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Promjenili ste lozinku za '
-    CHANGEPASSWORDTEXT3: 'Promjeni lozinku'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Pozdrav
+    TEXT1: 'Ovdje je Vaš'
+    TEXT2: 'link za resetiranje lozinke'
+    TEXT3: za
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Ne
     YESANSWER: Da
@@ -32,7 +33,7 @@ hr:
     SHOWONCLICKTITLE: 'Promjenite lozinku'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'manje od minute'
     TIMEDIFFAGO: 'prije {difference}'
     TIMEDIFFIN: 'za {difference}'
@@ -46,26 +47,18 @@ hr:
     CHOOSE: (Odaberite)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Molimo unesite email adresu'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 'bilo koji'
-  ForgotPasswordEmail_ss:
-    HELLO: Pozdrav
-    TEXT1: 'Ovdje je Vaš'
-    TEXT2: 'link za resetiranje lozinke'
-    TEXT3: za
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Lozinke se ne slažu'
     VALIDATIONPASSWORDSNOTEMPTY: 'Lozinke moraju imati najmanje jedan broj i jedan alfanumerički znak'
   SilverStripe\Forms\FormField:
     NONE: nijedan
-  GridAction:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DELETE_DESCRIPTION: Obriši
     Delete: Obriši
   SilverStripe\Forms\GridField\GridField:
-    Add: 'Dodaj {name}'
-    Filter: Filter
-    FilterBy: 'Filtriraj po'
-    Find: Pronađi
+    OF: od
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Odustani
     Create: Kreiraj
@@ -73,7 +66,7 @@ hr:
     DeletePermissionsFailure: 'Nema dozvole brisanja'
     Deleted: 'Obrisano %s %s'
     Save: Spremi
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Uredi
   SilverStripe\Security\Group:
     Code: 'Krupni kod'
@@ -129,7 +122,7 @@ hr:
     Preview: Pregled
   SilverStripe\Forms\MoneyField:
     FIELDLABELCURRENCY: Valuta
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Stranica
     View: Pregled
   SilverStripe\Security\Permission:
@@ -156,11 +149,7 @@ hr:
     ROLES: Uloge
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Osnovno
-  TableListField:
-    Print: Ispiši
-  TableListField_PageControls_ss:
-    OF: od
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     EDIT: Uredi
     EDITINFO: 'Uredi ovu datoteku'
     REMOVE: Ukloni
diff --git a/lang/hu.yml b/lang/hu.yml
index 08a7bc203..9b7a2624d 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -1,5 +1,5 @@
 hu:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Először feltöltve'
     LASTEDIT: 'Utoljára változott'
     SIZE: Méret
@@ -8,15 +8,12 @@ hu:
     ENTERINFO: 'Kérünk, ajd meg egy felhasználónevet és jelszót.'
     ERRORNOTADMIN: 'Ez a felhasználó nem adminisztrátor. '
     ERRORNOTREC: 'Ez a felhasználónév / jelszó nem létezik'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Megváltoztattad a jelszavad erre: '
-    HELLO: Szia!
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
+    HELLO: Szia
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Jelszó Megváltoztatása'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Válassz)
-  ForgotPasswordEmail_ss:
-    HELLO: Szia
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'A jelszavak nem egyeznek meg.'
     VALIDATIONPASSWORDSNOTEMPTY: 'A jelszó nem lehet üres.'
diff --git a/lang/id.yml b/lang/id.yml
index 49dcf0f3b..95e02487c 100644
--- a/lang/id.yml
+++ b/lang/id.yml
@@ -1,5 +1,5 @@
 id:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Pertama diunggah'
     LASTEDIT: 'Terakhir diubah'
     SIZE: 'Ukuran berkas'
@@ -9,7 +9,7 @@ id:
     ENTERINFO: 'Mohon isikan nama pengguna dan kata kunci.'
     ERRORNOTADMIN: 'Pengguna tersebut bukan pengelola.'
     ERRORNOTREC: 'Nama pengguna dan kata kunci tidak dikenal'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Semua
     NOANSWER: Tidak
     YESANSWER: Ya
@@ -25,9 +25,11 @@ id:
     SUCCESSCONTENT: '<p>Berhasil masuk. Jika tidak secara otomatis diarahkan, klik <a target="_top" href="{link}">di sini</a></p>'
     TimedOutTitleAnonymous: 'Sesi Anda sudah habis.'
     TimedOutTitleMember: 'Hai {name}!<br />Sesi Anda sudah habis.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Anda mengganti kata kunci menjadi'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hai
+    TEXT1: 'Berikut ini '
+    TEXT2: 'tautan ganti kata kunci'
+    TEXT3: untuk
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Tidak
     YESANSWER: Ya
@@ -38,7 +40,7 @@ id:
     SHOWONCLICKTITLE: 'Ganti Kata Kunci'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'kurang dari semenit'
     TIMEDIFFAGO: '{difference} yang lalu'
     TIMEDIFFIN: 'pada {difference}'
@@ -55,13 +57,8 @@ id:
     SOURCE_VALIDATION: 'Mohon pilih nilai dari daftar yang ada. ''{value}'' bukan pilihan valid'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Mohon isikan alamat email'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Semua
-  ForgotPasswordEmail_ss:
-    HELLO: Hai
-    TEXT1: 'Berikut ini '
-    TEXT2: 'tautan ganti kata kunci'
-    TEXT3: untuk
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Sesi Anda sudah habis. Mohon kirim ulang formulir.'
     CSRF_FAILED_MESSAGE: 'Kemungkinan ada masalah teknis. Mohon klik tombol kembali, muat ulang browser, dan coba lagi.'
@@ -72,27 +69,11 @@ id:
     VALIDCURRENCY: 'Mohon isikan mata uang yang benar'
   SilverStripe\Forms\FormField:
     NONE: 'tidak ada'
-  GridAction:
-    DELETE_DESCRIPTION: Hapus
-    Delete: Hapus
-    UnlinkRelation: Unlink
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Tambah {name}'
-    Filter: Saring
-    FilterBy: 'Saring menurut '
-    Find: Cari
-    LinkExisting: 'Tautan yang Ada'
-    NewRecord: '%s baru'
-    NoItemsFound: 'Tidak ada data'
-    PRINTEDAT: 'Dicetak pada'
-    PRINTEDBY: 'Dicetak oleh'
-    PlaceHolder: 'Cari {type}'
-    PlaceHolderWithLabels: 'Cari {type} menurut {name}'
-    RelationSearch: 'Cari yang terkait'
-    ResetFilter: Reset
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Tidak ada ijin menghapus'
     EditPermissionsFailure: 'Tidak ada ijin membuka tautan'
+  SilverStripe\Forms\GridField\GridField:
+    OF: dari
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Batal
     Create: Buat
@@ -100,7 +81,7 @@ id:
     DeletePermissionsFailure: 'Tidak ada ijin menghapus'
     Deleted: '%s %s dihapus'
     Save: Simpan
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Edit
   SilverStripe\Security\Group:
     AddRole: 'Tambahkan peran untuk kelompok ini'
@@ -178,7 +159,7 @@ id:
     IsNullLabel: N/A
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' bukan angka, hanya angka yang dapat diterima isian ini'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Laman
     View: Tampilkan
   SilverStripe\Security\PasswordValidator:
@@ -186,9 +167,7 @@ id:
     PREVPASSWORD: 'Anda sudah pernah menggunakan kata kunci tersebut, mohon pilih kata kunci yang baru'
     TOOSHORT: 'Kata kunci terlalu singkat, setidaknya harus terdiri dari %s karakter atau lebih'
   SilverStripe\Security\Permission:
-    AdminGroup: Pengelola
-    FULLADMINRIGHTS: 'Hak pengelolaan penuh'
-    FULLADMINRIGHTS_HELP: 'Abaikan dan kesampingkan semua perijinan yang terhubung lainnya.'
+    UserPermissionsIntro: 'Menghubungkan kelompok ke pengguna ini akan menyesuaikan perijinannya. Lihat bagian Kelompok untuk rincian perijinan pada kelompok individu.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'dihubungkan ke "{title}"'
     FromGroup: 'diwarisi dari kelompok "{title}"'
@@ -199,8 +178,6 @@ id:
     Title: Judul
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Tidak dapat menghubungkan kode "%s" dengan perijinan khusus (memerlukan akses PENGELOLA)'
-  Permissions:
-    UserPermissionsIntro: 'Menghubungkan kelompok ke pengguna ini akan menyesuaikan perijinannya. Lihat bagian Kelompok untuk rincian perijinan pada kelompok individu.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Mohon isikan nomer telpon yang benar'
   SilverStripe\Security\Security:
@@ -226,14 +203,9 @@ id:
     ROLESDESCRIPTION: 'Peran adalah set perijinan yang sudah ditentukan, dan dapat dihubungkan ke kelompok.<br />Dapat diwariskan dari kelompok induk jika diperlukan.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Utama
-  TableListField:
-    CSVEXPORT: 'Ekspor ke CSV'
-    Print: Cetak
-  TableListField_PageControls_ss:
-    OF: dari
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Isikan format waktu yang benar ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensi
     EDIT: Edit
     EDITINFO: 'Edit berkas ini'
diff --git a/lang/id_ID.yml b/lang/id_ID.yml
index b7a24da78..125f9bb37 100644
--- a/lang/id_ID.yml
+++ b/lang/id_ID.yml
@@ -1,5 +1,5 @@
 id_ID:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Pertama diunggah'
     LASTEDIT: 'Terakhir diubah'
     SIZE: 'Ukuran berkas'
@@ -10,7 +10,7 @@ id_ID:
     ENTERINFO: 'Mohon isikan nama pengguna dan kata kunci.'
     ERRORNOTADMIN: 'Pengguna tersebut bukan pengelola.'
     ERRORNOTREC: 'Nama pengguna dan kata kunci tidak dikenal'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Semua
     NOANSWER: Tidak
     YESANSWER: Ya
@@ -26,9 +26,11 @@ id_ID:
     SUCCESSCONTENT: '<p>Berhasil masuk. Jika tidak secara otomatis diarahkan, klik <a target="_top" href="{link}">di sini</a></p>'
     TimedOutTitleAnonymous: 'Sesi Anda sudah habis.'
     TimedOutTitleMember: 'Hai {name}!<br />Sesi Anda sudah habis.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Anda mengganti kata kunci menjadi'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hai
+    TEXT1: 'Berikut ini '
+    TEXT2: 'tautan ganti kata kunci'
+    TEXT3: untuk
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Tidak
     YESANSWER: Ya
@@ -39,7 +41,7 @@ id_ID:
     SHOWONCLICKTITLE: 'Ganti Kata Kunci'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'kurang dari semenit'
     TIMEDIFFAGO: '{difference} yang lalu'
     TIMEDIFFIN: 'pada {difference}'
@@ -56,13 +58,8 @@ id_ID:
     SOURCE_VALIDATION: 'Mohon pilih nilai dari daftar yang ada. ''{value}'' bukan pilihan valid'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Mohon isikan alamat email'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Semua
-  ForgotPasswordEmail_ss:
-    HELLO: Hai
-    TEXT1: 'Berikut ini '
-    TEXT2: 'tautan ganti kata kunci'
-    TEXT3: untuk
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Sesi Anda sudah habis. Mohon kirim ulang formulir.'
     CSRF_FAILED_MESSAGE: 'Kemungkinan ada masalah teknis. Mohon klik tombol kembali, muat ulang browser, dan coba lagi.'
@@ -73,27 +70,11 @@ id_ID:
     VALIDCURRENCY: 'Mohon isikan mata uang yang benar'
   SilverStripe\Forms\FormField:
     NONE: 'tidak ada'
-  GridAction:
-    DELETE_DESCRIPTION: Hapus
-    Delete: Hapus
-    UnlinkRelation: Unlink
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Tambah {name}'
-    Filter: Saring
-    FilterBy: 'Saring menurut '
-    Find: Cari
-    LinkExisting: 'Tautan yang Ada'
-    NewRecord: '%s baru'
-    NoItemsFound: 'Tidak ada data'
-    PRINTEDAT: 'Dicetak pada'
-    PRINTEDBY: 'Dicetak oleh'
-    PlaceHolder: 'Cari {type}'
-    PlaceHolderWithLabels: 'Cari {type} menurut {name}'
-    RelationSearch: 'Cari yang terkait'
-    ResetFilter: Reset
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Tidak ada ijin menghapus'
     EditPermissionsFailure: 'Tidak ada ijin membuka tautan'
+  SilverStripe\Forms\GridField\GridField:
+    OF: dari
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Batal
     Create: Buat
@@ -101,7 +82,7 @@ id_ID:
     DeletePermissionsFailure: 'Tidak ada ijin menghapus'
     Deleted: '%s %s dihapus'
     Save: Simpan
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Edit
   SilverStripe\Security\Group:
     AddRole: 'Tambahkan peran untuk kelompok ini'
@@ -179,7 +160,7 @@ id_ID:
     IsNullLabel: N/A
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' bukan angka, hanya angka yang dapat diterima isian ini'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Laman
     View: Tampilkan
   SilverStripe\Security\PasswordValidator:
@@ -187,9 +168,7 @@ id_ID:
     PREVPASSWORD: 'Anda sudah pernah menggunakan kata kunci tersebut, mohon pilih kata kunci yang baru'
     TOOSHORT: 'Kata kunci terlalu singkat, setidaknya harus terdiri dari %s karakter atau lebih'
   SilverStripe\Security\Permission:
-    AdminGroup: Pengelola
-    FULLADMINRIGHTS: 'Hak pengelolaan penuh'
-    FULLADMINRIGHTS_HELP: 'Abaikan dan kesampingkan semua perijinan yang terhubung lainnya.'
+    UserPermissionsIntro: 'Menghubungkan kelompok ke pengguna ini akan menyesuaikan perijinannya. Lihat bagian Kelompok untuk rincian perijinan pada kelompok individu.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'dihubungkan ke "{title}"'
     FromGroup: 'diwarisi dari kelompok "{title}"'
@@ -200,8 +179,6 @@ id_ID:
     Title: Judul
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Tidak dapat menghubungkan kode "%s" dengan perijinan khusus (memerlukan akses PENGELOLA)'
-  Permissions:
-    UserPermissionsIntro: 'Menghubungkan kelompok ke pengguna ini akan menyesuaikan perijinannya. Lihat bagian Kelompok untuk rincian perijinan pada kelompok individu.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Mohon isikan nomer telpon yang benar'
   SilverStripe\Security\Security:
@@ -227,14 +204,9 @@ id_ID:
     ROLESDESCRIPTION: 'Peran adalah set perijinan yang sudah ditentukan, dan dapat dihubungkan ke kelompok.<br />Dapat diwariskan dari kelompok induk jika diperlukan.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Utama
-  TableListField:
-    CSVEXPORT: 'Ekspor ke CSV'
-    Print: Cetak
-  TableListField_PageControls_ss:
-    OF: dari
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Isikan format waktu yang benar ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensi
     EDIT: Edit
     EDITINFO: 'Edit berkas ini'
diff --git a/lang/is.yml b/lang/is.yml
index 0f3fd31c7..b76eb91ff 100644
--- a/lang/is.yml
+++ b/lang/is.yml
@@ -3,11 +3,13 @@ is:
     ENTERINFO: 'Vinsamlegast sláðu inn notendanafn og lykilorð.'
     ERRORNOTADMIN: 'Þessi notandi er ekki stjórnandi'
     ERRORNOTREC: 'Þetta notendanafn / lykilorð er ekki til'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Einhver
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Þú breyttir þínu lykilorði vegna'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hæ
+    TEXT1: 'Hérna er þitt'
+    TEXT2: 'endursetja lykilorð'
+    TEXT3: fyrir
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Breyta lykliorði'
   SilverStripe\Forms\CurrencyField:
@@ -17,13 +19,8 @@ is:
     TODAY: 'í dag'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Veldu)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Einhver
-  ForgotPasswordEmail_ss:
-    HELLO: Hæ
-    TEXT1: 'Hérna er þitt'
-    TEXT2: 'endursetja lykilorð'
-    TEXT3: fyrir
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Lykilorðin stemma ekki'
     VALIDATIONPASSWORDSNOTEMPTY: 'Lykilorðin mega ekki vera tóm'
@@ -94,5 +91,5 @@ is:
     ROLES: Hlutverk
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Aðal
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'Flytja út í CSV'
diff --git a/lang/it.yml b/lang/it.yml
index 541d1cf87..adfdbc639 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -1,5 +1,5 @@
 it:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Inizialmente caricato'
     HEIGHT: Altezza
     LASTEDIT: 'Ultima modifica'
@@ -11,7 +11,7 @@ it:
     ENTERINFO: 'Per favore inserisci un nome utente e la password.'
     ERRORNOTADMIN: 'Questo utente non è amministratore.'
     ERRORNOTREC: 'Nome utente / password non riconosciuti'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Qualsiasi
     NOANSWER: 'No'
     YESANSWER: Sì
@@ -27,10 +27,11 @@ it:
     SUCCESSCONTENT: '<p>Accesso eseguito. Se non sarai ridirezionato automaticamente, <a target="_top" href="{link}">cliccare qui</a></p>'
     TimedOutTitleAnonymous: 'La tua sessione è scaduta.'
     TimedOutTitleMember: 'Ciao {name}!<br />La tua sessione è scaduta.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Hai cambiato la password per'
-    CHANGEPASSWORDTEXT3: 'Cambia password'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Ciao
+    TEXT1: 'Questa è la tua'
+    TEXT2: 'Link per l''azzeramento della password'
+    TEXT3: per
   SilverStripe\Forms\CheckboxField:
     NOANSWER: 'No'
     YESANSWER: Sì
@@ -44,7 +45,7 @@ it:
     SHOWONCLICKTITLE: 'Cambia password'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'meno di un minuto'
     TIMEDIFFAGO: '{difference} fa'
     TIMEDIFFIN: 'in {difference}'
@@ -62,13 +63,8 @@ it:
     SOURCE_VALIDATION: 'Per favore selezionare un valore tra quelli forniti. {value} non è un''opzione valida'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Inserisci un indirizzo e-mail'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Qualsiasi
-  ForgotPasswordEmail_ss:
-    HELLO: Ciao
-    TEXT1: 'Questa è la tua'
-    TEXT2: 'Link per l''azzeramento della password'
-    TEXT3: per
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'La tua sessione è scaduta. Per favore ritrasmettere la form.'
     CSRF_FAILED_MESSAGE: 'Sembra che ci sia stato un problema tecnico. Per favore cliccare sul pulsante "indietro", ricaricare la pagina e riprovare.'
@@ -80,27 +76,11 @@ it:
     VALIDCURRENCY: 'Inserisci una valuta valida'
   SilverStripe\Forms\FormField:
     NONE: nessuno
-  GridAction:
-    DELETE_DESCRIPTION: Elimina
-    Delete: Elimina
-    UnlinkRelation: Scollega
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Aggiungi {name}'
-    Filter: Filtra
-    FilterBy: 'Filtra per'
-    Find: Trova
-    LinkExisting: 'Collega esistente'
-    NewRecord: 'Nuovo %s'
-    NoItemsFound: 'Nessun elemento trovato'
-    PRINTEDAT: 'Stampato alle'
-    PRINTEDBY: 'Stampato da'
-    PlaceHolder: 'Trova {type}'
-    PlaceHolderWithLabels: 'Trova {type} per {name}'
-    RelationSearch: 'Cerca relazione'
-    ResetFilter: Azzera
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Non hai i permessi per eliminare'
     EditPermissionsFailure: 'Non hai i permessi per modificare'
+  SilverStripe\Forms\GridField\GridField:
+    OF: di
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Annulla
     Create: Crea
@@ -108,7 +88,7 @@ it:
     DeletePermissionsFailure: 'Non hai i permessi per eliminare'
     Deleted: 'Eliminato %s %s'
     Save: Salva
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Modifica
   SilverStripe\Security\Group:
     PLURALNAME: Gruppi
@@ -186,7 +166,7 @@ it:
     IsNullLabel: 'è nullo.'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' non è un numero, solo numeri possono essere accettati per questo campo'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Pagina
     View: Visualizza
   SilverStripe\Security\PasswordValidator:
@@ -194,8 +174,7 @@ it:
     PREVPASSWORD: 'Hai già usato questa password in passato, per favore scegline una nuova'
     TOOSHORT: 'La password è troppo corta, deve essere lunga %s o più caratteri'
   SilverStripe\Security\Permission:
-    PLURALNAME: Permessi
-    SINGULARNAME: Permesso
+    UserPermissionsIntro: 'Assegnando gruppi a questo utente modificherà i suoi permessi. Vedi la sezione gruppi per dettagli sui permessi dei singoli gruppi.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'assegnato a "{title}"'
     FromGroup: 'ereditato dal gruppo "{title}"'
@@ -207,8 +186,6 @@ it:
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: 'Codici di ruolo'
     SINGULARNAME: 'Codice di ruolo'
-  Permissions:
-    UserPermissionsIntro: 'Assegnando gruppi a questo utente modificherà i suoi permessi. Vedi la sezione gruppi per dettagli sui permessi dei singoli gruppi.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Per favore inserisci un numero di telefono valido'
   SilverStripe\Security\Security:
@@ -240,14 +217,9 @@ it:
     SINGULARNAME: 'Password utente'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principale
-  TableListField:
-    CSVEXPORT: 'Esporta come CSV'
-    Print: Stampa
-  TableListField_PageControls_ss:
-    OF: di
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Inserisci un formato d''ora valido ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensioni
     EDIT: Modifica
     EDITINFO: 'Modifica questo file'
diff --git a/lang/ja.yml b/lang/ja.yml
index a99c45fce..95a6354e7 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -1,5 +1,5 @@
 ja:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 初回アップロード日時
     LASTEDIT: 最終更新日
     SIZE: ファイルサイズ
@@ -9,17 +9,19 @@ ja:
     ENTERINFO: 'ユーザー名とパスワードを入力してください'
     ERRORNOTADMIN: 'このユーザーは管理者（アドミニストレーター）ではありません'
     ERRORNOTREC: 'ユーザー名 / パスワードは認識されませんでした'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 何でも
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: このサイトのパスワードが変更されました。
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: こんにちわ！
+    TEXT1: 'ここ''貴方の'
+    TEXT2: パスワードリセットのリンク
+    TEXT3: は
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'パスワードは少なくとも {min} 文字の長さが必要です。'
     BETWEEN: 'パスワードは {min} から {max} までの長さでなければならない。'
     MAXIMUM: 'パスワードは{max} 文字以内でなければなりません。'
     SHOWONCLICKTITLE: パスワード変更
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: １分以下
     TIMEDIFFAGO: '{difference}前'
     TIMEDIFFIN: '{difference}以内'
@@ -35,13 +37,8 @@ ja:
     CHOOSE: (選択)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'メールアドレスを入力してください'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 何でも
-  ForgotPasswordEmail_ss:
-    HELLO: こんにちわ！
-    TEXT1: 'ここ''貴方の'
-    TEXT2: パスワードリセットのリンク
-    TEXT3: は
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: パスワードが一致しません
     VALIDATIONPASSWORDSNOTEMPTY: パスワードが空欄です
@@ -50,27 +47,11 @@ ja:
     VALIDCURRENCY: '有効な通貨を入力してください'
   SilverStripe\Forms\FormField:
     NONE: 何もありません
-  GridAction:
-    DELETE_DESCRIPTION: 削除
-    Delete: 削除
-    UnlinkRelation: リンク解除
-  SilverStripe\Forms\GridField\GridField:
-    Add: '{name}を追加'
-    Filter: フィルタ
-    FilterBy: によってフィルター
-    Find: 探す
-    LinkExisting: 既存のリンク
-    NewRecord: 新しい%s
-    NoItemsFound: '項目が見つかりませんでした'
-    PRINTEDAT: で印刷
-    PRINTEDBY: によって印刷
-    PlaceHolder: '{type}を探す'
-    PlaceHolderWithLabels: '{name} によって{type} を検索する'
-    RelationSearch: 関連検索
-    ResetFilter: リセット
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 削除権限がありません
     EditPermissionsFailure: レコードのリンクを解除するための権限がありません
+  SilverStripe\Forms\GridField\GridField:
+    OF: の
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: キャンセル
     Create: 作成
@@ -78,7 +59,7 @@ ja:
     DeletePermissionsFailure: 削除権限がありません
     Deleted: '削除済み %s %s'
     Save: 保存
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: 編集
   SilverStripe\Security\Group:
     AddRole: 'このグループに役割を追加'
@@ -154,7 +135,7 @@ ja:
     IsNullLabel: NULLである
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}''は数値ではありません。このフィールドには数値のみが入力できます。'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: ページ
     View: 閲覧
   SilverStripe\Security\PasswordValidator:
@@ -162,9 +143,7 @@ ja:
     PREVPASSWORD: 'このパスワードは過去に使用されています、新しいパスワードを選択してください'
     TOOSHORT: パスワードが短すぎます、%文字以上でなければなりません
   SilverStripe\Security\Permission:
-    AdminGroup: '管理者'
-    FULLADMINRIGHTS: '完全な管理権'
-    FULLADMINRIGHTS_HELP: 暗黙的に定義または他のすべての割り当てられた権限を無効にする。
+    UserPermissionsIntro: 'このユーザーにグループを割り当てると、彼らが持っている権限を調整します。個々のグループの権限の詳細については、グループセクションを参照してください。'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: '"{title}" に割り当てられた'
     FromGroup: 'グループ"{title}"から継承'
@@ -173,8 +152,6 @@ ja:
   SilverStripe\Security\PermissionRole:
     OnlyAdminCanApply: '管理者のみ適用可能'
     Title: タイトル
-  Permissions:
-    UserPermissionsIntro: 'このユーザーにグループを割り当てると、彼らが持っている権限を調整します。個々のグループの権限の詳細については、グループセクションを参照してください。'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: '電話番号を入力してください'
   SilverStripe\Security\Security:
@@ -199,14 +176,9 @@ ja:
     ROLESDESCRIPTION: '役割は、事前定義された権限の設定であり、グループに割り当てることができます。<br /> 必要であれば、それらは親グループから継承されます。'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: メイン
-  TableListField:
-    CSVEXPORT: CSVにエクスポート
-    Print: 印刷
-  TableListField_PageControls_ss:
-    OF: の
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: '正しい時間フォーマット{{format}}を入力してください'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: 大きさ
     EDIT: 編集
     EDITINFO: このファイルを編集
diff --git a/lang/km.yml b/lang/km.yml
index 76ffb856e..2eb64dc25 100644
--- a/lang/km.yml
+++ b/lang/km.yml
@@ -1,5 +1,5 @@
 km:
-  ChangePasswordEmail_ss:
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: អ្នកបានផ្លាស់ប្តូរពាក្យសំងាត់សំរាប់
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: ផ្លាស់ប្តូរពាក្យសំងាត់
diff --git a/lang/lt.yml b/lang/lt.yml
index 44293d68a..921d68efa 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -1,5 +1,5 @@
 lt:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: Įkelta
     HEIGHT: Aukštis
     LASTEDIT: Redaguota
@@ -11,7 +11,7 @@ lt:
     ENTERINFO: 'Įveskite vartotojo vardą ir slaptažodį'
     ERRORNOTADMIN: 'Vartotojas nėra administratorius'
     ERRORNOTREC: 'Toks vartotojo vardas / slaptažodis neatpažintas'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Bet koks'
     NOANSWER: Ne
     YESANSWER: Taip
@@ -27,9 +27,11 @@ lt:
     SUCCESSCONTENT: '<p>Sėkmingai prisijungėte. Jeigu jūsų automatiškai nenukreipia, <a target="_top" href="{link}">spauskite čia</a></p>'
     TimedOutTitleAnonymous: 'Jūsų prisijungimo galiojimas pasibaigė.'
     TimedOutTitleMember: 'Sveiki, {name}!<br />Jūsų prisijungimo galiojimas pasibaigė.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Jūs pakeitėte slaptažodį'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Sveiki
+    TEXT1: Jūsų
+    TEXT2: 'slaptažodžio atstatymo nuoroda'
+    TEXT3: svetainei
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Ne
     YESANSWER: Taip
@@ -40,7 +42,7 @@ lt:
     SHOWONCLICKTITLE: 'Pakeisti slaptažodį'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: €
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'mažiau nei min.'
     TIMEDIFFAGO: 'prieš {difference}'
     TIMEDIFFIN: 'po {difference}'
@@ -57,13 +59,8 @@ lt:
     SOURCE_VALIDATION: 'Prašome pasirinkti reikšmę iš pateikto sąrašo. ''{value}'' yra negalima reikšmė.'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Prašome suvesti el. pašto adresą'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 'Bet koks'
-  ForgotPasswordEmail_ss:
-    HELLO: Sveiki
-    TEXT1: Jūsų
-    TEXT2: 'slaptažodžio atstatymo nuoroda'
-    TEXT3: svetainei
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Jūsų prisijungimas nebegalioja. Prašome iš naujo išsaugoti duomenis.'
     CSRF_FAILED_MESSAGE: 'Iškilo techninė problema. Prašome paspausti mygtuką Atgal, perkraukite naršyklės langą ir bandykite vėl.'
@@ -74,27 +71,11 @@ lt:
     VALIDCURRENCY: 'Prašome suvesti teisingą valiutą'
   SilverStripe\Forms\FormField:
     NONE: nėra
-  GridAction:
-    DELETE_DESCRIPTION: Ištrinti
-    Delete: Ištrinti
-    UnlinkRelation: Atkabinti
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Sukurti {name}'
-    Filter: Filtruoti
-    FilterBy: 'Filtruoti pagal '
-    Find: Rasti
-    LinkExisting: 'Pasirinkti esamą'
-    NewRecord: 'Naujas %s'
-    NoItemsFound: 'Įrašų nerasta'
-    PRINTEDAT: Atspausdinta
-    PRINTEDBY: Atspausdino
-    PlaceHolder: 'Rasti {type}'
-    PlaceHolderWithLabels: 'Rasti {type} pagal {name}'
-    RelationSearch: 'Sąryšių paieška'
-    ResetFilter: Atstatyti
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Nėra leidimų trynimui'
     EditPermissionsFailure: 'Nėra leidimų atjungti įrašą'
+  SilverStripe\Forms\GridField\GridField:
+    OF: iš
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Atšaukti
     Create: Sukurti
@@ -102,7 +83,7 @@ lt:
     DeletePermissionsFailure: 'Nėra leidimų trynimui'
     Deleted: 'Ištrinta %s %s'
     Save: Išsaugoti
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Redaguoti
   SilverStripe\Security\Group:
     AddRole: 'Pridėti rolę šiai grupei'
@@ -180,7 +161,7 @@ lt:
     IsNullLabel: Tuščias
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' nėra skaičius, prašome įvesti skaičių'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Puslapis
     View: Rodoma
   SilverStripe\Security\PasswordValidator:
@@ -188,9 +169,7 @@ lt:
     PREVPASSWORD: 'Jūs jau naudojote šį slaptažodį anksčiau, prašome sukurti naują'
     TOOSHORT: 'Slaptažodis yra per trumpas, jis turi būti sudarytas iš %s arba didesnio skaičiaus simbolių'
   SilverStripe\Security\Permission:
-    AdminGroup: Administratorius
-    FULLADMINRIGHTS: 'Pilnos administravimo teisės'
-    FULLADMINRIGHTS_HELP: 'Turi ir viršija visus kitus leidimus.'
+    UserPermissionsIntro: 'Priskiriant grupes šiam vartotojui, keičiasi vartotojui suteiktos teisės. Norėdami susipažinti detaliau su leidimais atskiroms grupėms, eikite į grupių sąrašą.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'priskirta "{title}"'
     FromGroup: 'paveldėta iš grupės "{title}"'
@@ -201,8 +180,6 @@ lt:
     Title: Pavadinimas
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Nepavyko priskirto kodo "%s" su priskirtais leidimais (būtina ADMIN prieiga)'
-  Permissions:
-    UserPermissionsIntro: 'Priskiriant grupes šiam vartotojui, keičiasi vartotojui suteiktos teisės. Norėdami susipažinti detaliau su leidimais atskiroms grupėms, eikite į grupių sąrašą.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Įveskite teisingą telefono numerį'
   SilverStripe\Security\Security:
@@ -228,14 +205,9 @@ lt:
     ROLESDESCRIPTION: 'Rolės - tai iš anksto sudarytas leidimų sąrašas, kuris gali būti priskirtas grupėms.<br />Jos yra paveldimos iš tėvinės grupės.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Pagrindinis
-  TableListField:
-    CSVEXPORT: 'Ekportuoti į CSV'
-    Print: Spausdinti
-  TableListField_PageControls_ss:
-    OF: iš
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Prašome suvesti laiką teisingu formatu ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Matmenys
     EDIT: Redaguoti
     EDITINFO: 'Redaguoti šią bylą'
diff --git a/lang/lv.yml b/lang/lv.yml
index 06598a1fd..28387be7b 100644
--- a/lang/lv.yml
+++ b/lang/lv.yml
@@ -3,11 +3,13 @@ lv:
     ENTERINFO: 'Lūdz ievadiet lietotājvārdu un paroli.'
     ERRORNOTADMIN: 'Šis lietotājs nav administrators.'
     ERRORNOTREC: 'Šis lietotājvārds / parole nav atpazīts'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Jebkurš
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Jūs nomainījāt savu paroli '
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Sveiki
+    TEXT1: 'Šeit ir Jūsu'
+    TEXT2: 'paroles atiestatīšanas saite'
+    TEXT3: ' '
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Mainīt paroli'
   SilverStripe\Forms\CurrencyField:
@@ -17,13 +19,8 @@ lv:
     TODAY: šodien
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Izvēlieties)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Jebkuru
-  ForgotPasswordEmail_ss:
-    HELLO: Sveiki
-    TEXT1: 'Šeit ir Jūsu'
-    TEXT2: 'paroles atiestatīšanas saite'
-    TEXT3: ' '
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Paroles nesakrīt'
     VALIDATIONPASSWORDSNOTEMPTY: 'Paroles nedrīkst būt tukšas'
@@ -103,5 +100,5 @@ lv:
     ROLESDESCRIPTION: 'Šī sadaļa jums ļauj pievienot šai grupai lomas. Lomas ir loģiskas atļauju grupas, kuras var labot Lomas cilnē'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Sākums
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'Eksportēt uz CSV'
diff --git a/lang/mi.yml b/lang/mi.yml
index f135da2e4..ad8ac4149 100644
--- a/lang/mi.yml
+++ b/lang/mi.yml
@@ -1,5 +1,5 @@
 mi:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Tukuatu tuatahi'
     LASTEDIT: 'Hurihanga tōmuri'
     SIZE: 'Rahi kōnae'
@@ -9,11 +9,13 @@ mi:
     ENTERINFO: 'Tāurua he ingoa kaiwhakamahi me te kupuhipa'
     ERRORNOTADMIN: 'Ehara tēnā kaiwhakamahi i te kaiwhakahaere'
     ERRORNOTREC: 'Kāore i te mōhiotia tēnā ingoa kaiwhakamahi / kupuhipa'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Ko tētahi'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Kua hurihia tō kupuhipa mō'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: 'Kia ora'
+    TEXT1: 'Anei tō'
+    TEXT2: 'hono tautuhi kupuhipa anō'
+    TEXT3: mā
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Kia {min} pūāhua i te iti rawa te roa o ngā kupuhipa.'
     BETWEEN: 'Me noho te roa o ngā kupuhipa i waenga i te {min} ki te {max} ngā pūāhua'
@@ -21,7 +23,7 @@ mi:
     SHOWONCLICKTITLE: 'Huri Kupuhipa'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'iti iho i te meneti kotahi'
     TIMEDIFFAGO: '{difference} i mua'
     TIMEDIFFIN: 'i roto i te {difference}'
@@ -37,13 +39,8 @@ mi:
     CHOOSE: (Kōwhiri)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Tāurua he wāhitau īmēra '
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 'Ko tētahi'
-  ForgotPasswordEmail_ss:
-    HELLO: 'Kia ora'
-    TEXT1: 'Anei tō'
-    TEXT2: 'hono tautuhi kupuhipa anō'
-    TEXT3: mā
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Kāore ngā kupuhipa i te ōrite'
     VALIDATIONPASSWORDSNOTEMPTY: 'Kia kaua e noho piako ngā kupuhipa'
@@ -52,27 +49,11 @@ mi:
     VALIDCURRENCY: 'Tāurua he moni tika'
   SilverStripe\Forms\FormField:
     NONE: Kore
-  GridAction:
-    DELETE_DESCRIPTION: Muku
-    Delete: Muku
-    UnlinkRelation: Wetehono
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Tāpiri {name}'
-    Filter: Tātari
-    FilterBy: 'Tātari mā'
-    Find: Rapu
-    LinkExisting: 'Hono Tīari'
-    NewRecord: '%s hōu'
-    NoItemsFound: 'Kāore i kitea he tūemi'
-    PRINTEDAT: 'I tāngia i'
-    PRINTEDBY: 'I tāngia e'
-    PlaceHolder: 'Tapu {type}'
-    PlaceHolderWithLabels: 'Rapu {type} mā te {name}'
-    RelationSearch: 'Rapu whanaunga'
-    ResetFilter: 'Tautuhi anō'
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Kāore he muku whakaaetanga'
     EditPermissionsFailure: 'Kāore ō whakaaetanga kia wetehono pūkete'
+  SilverStripe\Forms\GridField\GridField:
+    OF: o
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Whakakore
     Create: Hanga
@@ -80,7 +61,7 @@ mi:
     DeletePermissionsFailure: 'Kāore he whakaaetanga muku'
     Deleted: 'Kua mukua %s %s'
     Save: Tiaki
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Whakatika
   SilverStripe\Security\Group:
     AddRole: 'Tāpiritia he tūnga mō tēnei rōpū'
@@ -156,7 +137,7 @@ mi:
     IsNullLabel: 'He Kore Tēnei'
   SilverStripe\Forms\NumericField:
     VALIDATION: 'Ehara te ''{value}'' i te tau, ka taea ngā tau anake ki tēnei āpure'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Whārangi
     View: Tiro
   SilverStripe\Security\PasswordValidator:
@@ -164,9 +145,7 @@ mi:
     PREVPASSWORD: 'Kua whakamahi kētia tēnā kupuhipa i mua, kōwhiria he kupuhipa hou'
     TOOSHORT: 'He poto rawa te kupuhipa, me %s pūāhua neke atu te roa'
   SilverStripe\Security\Permission:
-    AdminGroup: Kaiwhakahaere
-    FULLADMINRIGHTS: 'Ngā motika kaiwhakahaere katoa'
-    FULLADMINRIGHTS_HELP: 'Ka whakapae me te takahi i ērā atu whakaaetanga katoa kua tautapatia.'
+    UserPermissionsIntro: 'Mā te tautapa rōpū ki tēnei kaiwhakamahi e whakarite āna whakaaetanga. Tirohia te wāhanga rōpū mō ngā taipitopito o ngā whakaaetanga o ngā rōpū takitahi.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'kua tautapatia ki  "{title}"'
     FromGroup: 'I tukuna iho i te rōpū "{title}"'
@@ -175,8 +154,6 @@ mi:
   SilverStripe\Security\PermissionRole:
     OnlyAdminCanApply: 'Ka taea anake te tono e ngā kaiwhakahaere'
     Title: Taitara
-  Permissions:
-    UserPermissionsIntro: 'Mā te tautapa rōpū ki tēnei kaiwhakamahi e whakarite āna whakaaetanga. Tirohia te wāhanga rōpū mō ngā taipitopito o ngā whakaaetanga o ngā rōpū takitahi.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Tāurua he tau waea tika'
   SilverStripe\Security\Security:
@@ -202,14 +179,9 @@ mi:
     ROLESDESCRIPTION: 'Ko ngā tūnga he huinga o ngā whakaaetanga i tautuhia i mua, ā, ka taea te tautapa i ēnei ki ngā rōpū.<br />I tukuna iho i ngā rōpū matua ki te hiahiatia.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Matua
-  TableListField:
-    CSVEXPORT: 'Kaweake ki CSV'
-    Print: Tā
-  TableListField_PageControls_ss:
-    OF: o
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Tāurua he hōputu wā tika ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: 'Ngā Rahinga'
     EDIT: Whakatika
     EDITINFO: 'Whakatikatia tēnei kōnae'
diff --git a/lang/ms.yml b/lang/ms.yml
index 45d121d7c..7c3f64045 100644
--- a/lang/ms.yml
+++ b/lang/ms.yml
@@ -3,7 +3,7 @@ ms:
     ENTERINFO: 'Maukkan ID pengguna dan katalaluan'
     ERRORNOTADMIN: 'Pengguna ini bukan pentadbir.'
     ERRORNOTREC: 'ID pengguna dan katalaluan tidak dikenali'
-  ChangePasswordEmail_ss:
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Anda telah mengubah kata lalaun untuk'
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Tukar Kata Aluan'
diff --git a/lang/nb.yml b/lang/nb.yml
index df64a9ce5..6891b5325 100644
--- a/lang/nb.yml
+++ b/lang/nb.yml
@@ -1,5 +1,5 @@
 nb:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Først opplastet'
     LASTEDIT: 'Sist endret'
     SIZE: Filstørrelse
@@ -9,11 +9,13 @@ nb:
     ENTERINFO: 'Vennligst skriv inn et brukernavn og passord'
     ERRORNOTADMIN: 'Denne brukeren er ikke administrator.'
     ERRORNOTREC: 'Det brukernavnet / passordet er ikke gjenkjent'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Sann eller usann'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Du har byttet passordet for'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hei
+    TEXT1: 'Her er din'
+    TEXT2: 'lenke for nullstilling av passord'
+    TEXT3: for
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Passordet må inneholde minst {min} skrifttegn'
     BETWEEN: 'Passord må inneholde {min} til {max} skrifttegn'
@@ -21,7 +23,7 @@ nb:
     SHOWONCLICKTITLE: 'Endre passord'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'mindre enn ett minutt'
     TIMEDIFFAGO: '{difference} siden'
     TIMEDIFFIN: 'i {difference}'
@@ -37,13 +39,8 @@ nb:
     CHOOSE: (Velg)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Vennligst skriv inn en epostadresse'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Noen
-  ForgotPasswordEmail_ss:
-    HELLO: Hei
-    TEXT1: 'Her er din'
-    TEXT2: 'lenke for nullstilling av passord'
-    TEXT3: for
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Passordene stemmer ikke overens'
     VALIDATIONPASSWORDSNOTEMPTY: 'Passord kan ikke være tomt'
@@ -52,27 +49,11 @@ nb:
     VALIDCURRENCY: 'Vennligst skriv inn gyldig valuta'
   SilverStripe\Forms\FormField:
     NONE: ingen
-  GridAction:
-    DELETE_DESCRIPTION: Slett
-    Delete: Slett
-    UnlinkRelation: 'Koble fra'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Legg til {name}'
-    Filter: Filtrer
-    FilterBy: 'Filtrer på '
-    Find: Finn
-    LinkExisting: 'Knytt til eksisterende'
-    NewRecord: 'Ny %s'
-    NoItemsFound: 'Ingen elementer ble funnet'
-    PRINTEDAT: 'Skrevet ut ved'
-    PRINTEDBY: 'Skrevet ut av'
-    PlaceHolder: 'Finn {type}'
-    PlaceHolderWithLabels: 'Finn {type} ved {name}'
-    RelationSearch: Relasjonssøk
-    ResetFilter: Tilbakestille
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Ikke tillatt å slette'
     EditPermissionsFailure: 'Ikke tilgang til å fjerne oppføringer'
+  SilverStripe\Forms\GridField\GridField:
+    OF: av
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Avbryt
     Create: Opprett
@@ -80,7 +61,7 @@ nb:
     DeletePermissionsFailure: 'Ikke tillatt å slette'
     Deleted: 'Slettet %s %s'
     Save: Lagre
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Rediger
   SilverStripe\Security\Group:
     AddRole: 'Legg til en rolle for denne gruppen'
@@ -157,7 +138,7 @@ nb:
     IsNullLabel: 'Er tom'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' er ikke et tall, kun tall aksepteres i dette feltet'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Side
     View: Viser
   SilverStripe\Security\PasswordValidator:
@@ -165,9 +146,7 @@ nb:
     PREVPASSWORD: 'Du har brukt passordet tidligere, vennligst velg et nytt passord'
     TOOSHORT: 'Passordet er for kort, det må være %s eller flere tegn langt'
   SilverStripe\Security\Permission:
-    AdminGroup: Administratorer
-    FULLADMINRIGHTS: 'Fulle administrative rettigheter'
-    FULLADMINRIGHTS_HELP: 'Overstyrer alle andre tilordnede tillatelser.'
+    UserPermissionsIntro: 'Ved å angi grupper til denne brukeren kan du justere tillatelsene han har. Se gruppeseksjonen for detaljer om tillatelser for individuelle grupper.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'tilordnet "{title}"'
     FromGroup: 'Arvet fra gruppe "{title}"'
@@ -178,8 +157,6 @@ nb:
     Title: Tittel
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Kan ikke angi kode "%s" med administratorrettigheter (krever ADMIN-tilgang)'
-  Permissions:
-    UserPermissionsIntro: 'Ved å angi grupper til denne brukeren kan du justere tillatelsene han har. Se gruppeseksjonen for detaljer om tillatelser for individuelle grupper.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Vennligst skriv inn et gyldig telefonnummer'
   SilverStripe\Security\Security:
@@ -205,14 +182,9 @@ nb:
     ROLESDESCRIPTION: 'Roller er forhåndsdefinerte lister av tillatelser og kan angis til grupper.<br />De blir arvet fra overerdnede grupper om nødvendig.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Hovedinnstillinger
-  TableListField:
-    CSVEXPORT: 'Eksporter til CSV'
-    Print: 'Skriv ut'
-  TableListField_PageControls_ss:
-    OF: av
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Vennligst skriv inn et gyldig tidsformat ({format}]'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensjoner
     EDIT: Rediger
     EDITINFO: 'Rediger denne filen'
diff --git a/lang/ne.yml b/lang/ne.yml
index 0fcff2153..926f495e4 100644
--- a/lang/ne.yml
+++ b/lang/ne.yml
@@ -3,13 +3,10 @@ ne:
     ENTERINFO: 'कृपया एउता प्रयोगकता नाम र पासओड हल्नुहोस्'
     ERRORNOTADMIN: 'यो प्रयोगकता मुख्य प्रयोगकता होइन'
     ERRORNOTREC: 'त्यो प्रयोगकता / पासओड बुझन् सकिएन'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'तपाईंले आफनो पासओड  यसका लागि परिवतन गर्नु भयो '
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: हाई
   SilverStripe\Forms\DropdownField:
     CHOOSE: (छान्)
-  ForgotPasswordEmail_ss:
-    HELLO: हाई
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'पासओडहरु मिल्दैन्नन'
     VALIDATIONPASSWORDSNOTEMPTY: 'पासओडहरु खालि छोड्न मिल्दैन'
diff --git a/lang/nl.yml b/lang/nl.yml
index fda48b625..7ff6fb4bc 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -1,5 +1,5 @@
 nl:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Eerste upload'
     HEIGHT: Hoogte
     LASTEDIT: 'Laatste wijziging'
@@ -11,7 +11,7 @@ nl:
     ENTERINFO: 'Voer een gebruikersnaam en wachtwoord in.'
     ERRORNOTADMIN: 'Die gebruiker is geen beheerder.'
     ERRORNOTREC: 'De gebruikersnaam en/of het wachtwoord wordt niet herkend'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Elke
     NOANSWER: Nee
     YESANSWER: Ja
@@ -27,15 +27,15 @@ nl:
     SUCCESSCONTENT: '<p>U bent ingelogd. <a target="_top" href="{link}">Klik hier</a> als u niet automatisch wordt doorgestuurd.</p>'
     TimedOutTitleAnonymous: 'Sessie is verlopen'
     TimedOutTitleMember: 'Hallo {name}!<br />Uw sessie is verlopen.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDFOREMAIL: 'Het wachtwoord voor het account met e-mailadres {email} is aangepast. Indien u uw wachtwoord niet heeft aangepast kunt u dat doen met onderstaande link.'
-    CHANGEPASSWORDTEXT1: 'U heeft het wachtwoord veranderd voor'
-    CHANGEPASSWORDTEXT3: 'Wachtwoord veranderen'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hallo
+    TEXT1: 'Hier is uw'
+    TEXT2: 'wachtwoord reset link'
+    TEXT3: voor
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Nee
     YESANSWER: Ja
-  CheckboxSetField_ss:
+  SilverStripe\Forms\CheckboxSetField.ss:
     NOOPTIONSAVAILABLE: 'Geen keuze mogelijk'
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Een wachtwoord moet tenminste {min} karakters hebben.'
@@ -45,7 +45,7 @@ nl:
     SHOWONCLICKTITLE: 'Verander wachtwoord'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'minder dan één minuut'
     TIMEDIFFAGO: '{difference} geleden'
     TIMEDIFFIN: 'in {difference}'
@@ -62,13 +62,8 @@ nl:
     SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Gelieve een e-mailadres in te voeren.'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Elke
-  ForgotPasswordEmail_ss:
-    HELLO: Hallo
-    TEXT1: 'Hier is uw'
-    TEXT2: 'wachtwoord reset link'
-    TEXT3: voor
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Uw sessie is verlopen. Verzend het formulier opnieuw.'
     CSRF_FAILED_MESSAGE: 'Er lijkt een technisch probleem te zijn. Klik op de knop terug, vernieuw uw browser, en probeer het opnieuw.'
@@ -79,27 +74,11 @@ nl:
     VALIDCURRENCY: 'Vul een geldige munteenheid in'
   SilverStripe\Forms\FormField:
     NONE: geen
-  GridAction:
-    DELETE_DESCRIPTION: Verwijderen
-    Delete: Verwijder
-    UnlinkRelation: Ontkoppelen
-  SilverStripe\Forms\GridField\GridField:
-    Add: '{name} toevoegen'
-    Filter: Filter
-    FilterBy: Filteren
-    Find: Zoeken
-    LinkExisting: 'Koppel een bestaand item'
-    NewRecord: 'Nieuw %s'
-    NoItemsFound: 'Geen items gevonden.'
-    PRINTEDAT: 'Geprint op'
-    PRINTEDBY: 'Geprint door'
-    PlaceHolder: 'Zoek {type}'
-    PlaceHolderWithLabels: 'Zoek {type} op {name}'
-    RelationSearch: 'Zoek relatie'
-    ResetFilter: Resetten
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
     EditPermissionsFailure: 'Geen toelating om te ontkoppelen'
+  SilverStripe\Forms\GridField\GridField:
+    OF: van
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Annuleren
     Create: Aanmaken
@@ -107,7 +86,7 @@ nl:
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
     Deleted: '%s %s verwijderd'
     Save: Opslaan
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Bewerken
   SilverStripe\Security\Group:
     AddRole: 'Voeg een rol toe aan deze groep'
@@ -189,7 +168,7 @@ nl:
     IsNullLabel: 'Is null'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' is geen getal, enkel getallen worden door dit veld geaccepteerd'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Pagina
     View: Bekijk
   SilverStripe\Security\PasswordValidator:
@@ -197,9 +176,7 @@ nl:
     PREVPASSWORD: 'U heeft dit wachtwoord in het verleden al gebruikt, kies a.u.b. een nieuw wachtwoord.'
     TOOSHORT: 'Het wachtwoord is te kort, het moet minimaal %s karakters hebben'
   SilverStripe\Security\Permission:
-    AdminGroup: Beheerder
-    FULLADMINRIGHTS: 'Volledige admin rechten'
-    FULLADMINRIGHTS_HELP: 'Impliceert en overstemt alle andere toegewezen rechten.'
+    UserPermissionsIntro: 'Groepen aan deze gebruiker toewijzen zullen diens permissies aanpassen. Zie de sectie Groepen voor meer informatie over machtigingen voor afzonderlijke groepen.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'toegewezen aan "{title}"'
     FromGroup: 'geërfd van de groep "{title}"'
@@ -210,8 +187,6 @@ nl:
     SINGULARNAME: Rol
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'U moet (ADMIN) rechten hebben om de code "%s" toe te kennen'
-  Permissions:
-    UserPermissionsIntro: 'Groepen aan deze gebruiker toewijzen zullen diens permissies aanpassen. Zie de sectie Groepen voor meer informatie over machtigingen voor afzonderlijke groepen.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Voer een geldig telefoonnummer in'
   SilverStripe\Security\Security:
@@ -237,15 +212,9 @@ nl:
     ROLESDESCRIPTION: 'In deze sectie kunt u rollen toevoegen aan deze groep. Rollen zijn logische groeperingen van rechten die in het Rollen tabblad gewijzigd kunnen worden.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Hoofdgedeelte
-  TableListField:
-    CSVEXPORT: 'Exporteer naar CSV'
-    CSVIMPORT: 'CSV importeren'
-    Print: Afdrukken
-  TableListField_PageControls_ss:
-    OF: van
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Vul een geldig datumformaat in ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Afmetingen
     EDIT: Bewerken
     EDITINFO: 'Bewerk dit bestand'
diff --git a/lang/pa.yml b/lang/pa.yml
index ecde91411..19b1eeb95 100644
--- a/lang/pa.yml
+++ b/lang/pa.yml
@@ -2,13 +2,10 @@ pa:
   SilverStripe\Security\BasicAuth:
     ENTERINFO: 'ਿਕ੍ਰਪਾ ਕਰਕੇ ਇੱਕ username ਅਤੇ password ਪਾਉ'
     ERRORNOTADMIN: 'ਇਹ user ਪ੍ਰਬੰਧਕ ਨਹੀ ਹੈ।'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'ਤੁਸੀ ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲਿਆ ਖਾਤਰ'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: ਹਾਏ
   SilverStripe\Forms\DropdownField:
     CHOOSE: '( ਚੁਣੋ )'
-  ForgotPasswordEmail_ss:
-    HELLO: ਹਾਏ
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords ਮੇਲ ਨਹੀ ਖਾਦੇ '
     VALIDATIONPASSWORDSNOTEMPTY: 'Passwords ਖ਼ਾਲੀ ਨਹੀ ਹੋ ਸਕਦੇ '
diff --git a/lang/pl.yml b/lang/pl.yml
index 52db75541..3d815e4b8 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -1,5 +1,5 @@
 pl:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Po raz pierwszy wgrany'
     LASTEDIT: 'Ostatnio zmieniony'
     SIZE: 'Rozmiar pliku'
@@ -9,11 +9,13 @@ pl:
     ENTERINFO: 'Wprowadź username i hasło'
     ERRORNOTADMIN: 'Ten użytkownik nie jest administratorem'
     ERRORNOTREC: 'Nie istnieje taki username/hasło'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Jakikolwiek
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Zmieniłeś hasło na'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Cześć
+    TEXT1: 'Oto twój'
+    TEXT2: 'link zmiany hasła'
+    TEXT3: dla
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Hasła muszą mieć przynajmniej {min} znaków.'
     BETWEEN: 'Hasła muszą mieć długość pomiędzy {min} a {max} znaków.'
@@ -21,7 +23,7 @@ pl:
     SHOWONCLICKTITLE: 'Zmiana Hasła'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'mniej niż minuta'
     TIMEDIFFAGO: '{difference} temu'
     TIMEDIFFIN: 'w {difference}'
@@ -37,13 +39,8 @@ pl:
     CHOOSE: (wybierz)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Proszę podaj adres e-mail'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Jakikolwiek
-  ForgotPasswordEmail_ss:
-    HELLO: Cześć
-    TEXT1: 'Oto twój'
-    TEXT2: 'link zmiany hasła'
-    TEXT3: dla
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Hasła nie są takie same'
     VALIDATIONPASSWORDSNOTEMPTY: 'Hasło nie może być puste'
@@ -52,27 +49,11 @@ pl:
     VALIDCURRENCY: 'Proszę podaj prawidłową walutę'
   SilverStripe\Forms\FormField:
     NONE: brak
-  GridAction:
-    DELETE_DESCRIPTION: Usuń
-    Delete: Usuń
-    UnlinkRelation: 'Usuń łącze'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Dodaj {name}'
-    Filter: Filtr
-    FilterBy: 'Filtruj wg'
-    Find: Wyszukaj
-    LinkExisting: 'Linkuj istniejący'
-    NewRecord: 'Nowy %s'
-    NoItemsFound: 'Nie znaleziono elementów'
-    PRINTEDAT: 'Wydrukowane na'
-    PRINTEDBY: 'Wydrukowane przez'
-    PlaceHolder: 'Znajdź {type}'
-    PlaceHolderWithLabels: 'Znajdź {type} wg {name}'
-    RelationSearch: 'Wyszukiwanie powiązań'
-    ResetFilter: Resetuj
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Brak uprawnień do usuwania'
     EditPermissionsFailure: 'Nie masz uprawnień, aby odłączyć rekord'
+  SilverStripe\Forms\GridField\GridField:
+    OF: z
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Anuluj
     Create: Stwórz
@@ -80,7 +61,7 @@ pl:
     DeletePermissionsFailure: 'Brak uprawnień do usuwania'
     Deleted: 'Usunięto %s %s'
     Save: Zapisz
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Edytuj
   SilverStripe\Security\Group:
     AddRole: 'Dodaj rolę dla tej grupy'
@@ -157,7 +138,7 @@ pl:
     IsNullLabel: 'Jest Pusty'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' nie jest liczbą, to pole przyjmuje tylko liczby'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Strona
     View: Widok
   SilverStripe\Security\PasswordValidator:
@@ -165,9 +146,7 @@ pl:
     PREVPASSWORD: 'Użyłeś już tego hasła wcześniej, proszę wybrać nowe'
     TOOSHORT: 'Hasło jest za krótkie, proszę podać %s znaków lub więcej'
   SilverStripe\Security\Permission:
-    AdminGroup: Administrator
-    FULLADMINRIGHTS: 'Pełne prawa administracyjne'
-    FULLADMINRIGHTS_HELP: 'Zatwierdza i nadpisuje wszystkie istniejące uprawnienia'
+    UserPermissionsIntro: 'Przydzielenie grup temu użytkownikowi spowoduje zmianę jego uprawnień. Odwołaj się do sekcji Grupy aby dowiedzieć się więcej o uprawnieniach grupowych.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'przypisany do "{title}"'
     FromGroup: 'odziedziczone z grupy "{title}"'
@@ -178,8 +157,6 @@ pl:
     Title: Tytuł
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Nie można przyporządkować uprzywilejowanego uprawnienia "%s" (wymagane uprawnienie ADMIN)'
-  Permissions:
-    UserPermissionsIntro: 'Przydzielenie grup temu użytkownikowi spowoduje zmianę jego uprawnień. Odwołaj się do sekcji Grupy aby dowiedzieć się więcej o uprawnieniach grupowych.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Wprowadź poprawny numer telefonu'
   SilverStripe\Security\Security:
@@ -205,14 +182,9 @@ pl:
     ROLESDESCRIPTION: 'Sekcja umożliwia dodanie ról do grupy. Role są logicznie uporządkowanymi uprawnieniami, które można edytować w zakładce Role'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Główny
-  TableListField:
-    CSVEXPORT: 'Eksportuj do CSV'
-    Print: Drukuj
-  TableListField_PageControls_ss:
-    OF: z
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Proszę wprowadź prawidłowy format czasu ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Rozmiar
     EDIT: Edytuj
     EDITINFO: 'Edytuj plik'
diff --git a/lang/pt.yml b/lang/pt.yml
index 817ff712b..1655214c3 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -3,11 +3,13 @@ pt:
     ENTERINFO: 'Por favor insira um nome de utilizador e password.'
     ERRORNOTADMIN: 'Esse utilizador não é um administrador.'
     ERRORNOTREC: 'Esse nome de utilizador / password não é válido'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Qualquer
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Modificou a sua password para'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Olá
+    TEXT1: 'Este é o seu'
+    TEXT2: 'link para alterar password'
+    TEXT3: para
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Mudar password'
   SilverStripe\Forms\DateField:
@@ -15,32 +17,17 @@ pt:
     TODAY: Hoje
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Escolha)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Qualquer
-  ForgotPasswordEmail_ss:
-    HELLO: Olá
-    TEXT1: 'Este é o seu'
-    TEXT2: 'link para alterar password'
-    TEXT3: para
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords não coincidem'
     VALIDATIONPASSWORDSNOTEMPTY: 'Passwords não podem estar em branco'
   SilverStripe\Forms\FormField:
     NONE: nenhum
-  GridAction:
-    Delete: Apagar
-  SilverStripe\Forms\GridField\GridField:
-    Filter: Filtrar
-    Find: Procurar
-    LinkExisting: 'Link existente'
-    NewRecord: 'Novo %s'
-    NoItemsFound: 'Não foram encontrados elementos'
-    PRINTEDAT: 'Impresso em'
-    PRINTEDBY: 'Impresso por'
-    RelationSearch: 'Pesquisa relacionada'
-    ResetFilter: Redefinir
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Não tem permissões para apagar'
+  SilverStripe\Forms\GridField\GridField:
+    CSVEXPORT: 'Exportar para CSV'
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Cancelar
   SilverStripe\Security\Group:
@@ -114,8 +101,6 @@ pt:
     ROLES: Regras
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principal
-  TableListField:
-    CSVEXPORT: 'Exportar para CSV'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     EDITINFO: 'Editar este ficheiro'
     FIELDNOTSET: 'Informação do ficheiro não encontrada'
diff --git a/lang/pt_BR.yml b/lang/pt_BR.yml
index fbbab40ad..509ff23be 100644
--- a/lang/pt_BR.yml
+++ b/lang/pt_BR.yml
@@ -1,5 +1,5 @@
 pt_BR:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Primeiro upload'
     LASTEDIT: 'Última Alteração'
     SIZE: Tamanho
@@ -8,9 +8,11 @@ pt_BR:
     ENTERINFO: 'Por favor entre nome de usuário e senha.'
     ERRORNOTADMIN: 'Este usuário não é um administrador'
     ERRORNOTREC: 'Este nome de usuário / senha não é reconhecido'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Você alterou sua senha para'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Olá
+    TEXT1: 'Este é seu'
+    TEXT2: 'link para reiniciar sua senha'
+    TEXT3: para
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'Trocar senha'
   SilverStripe\Forms\CurrencyField:
@@ -20,11 +22,6 @@ pt_BR:
     TODAY: hoje
   SilverStripe\Forms\DropdownField:
     CHOOSE: Selecione
-  ForgotPasswordEmail_ss:
-    HELLO: Olá
-    TEXT1: 'Este é seu'
-    TEXT2: 'link para reiniciar sua senha'
-    TEXT3: para
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Senha não confere'
     VALIDATIONPASSWORDSNOTEMPTY: 'As Passwords não podem estar vazias'
@@ -89,5 +86,5 @@ pt_BR:
     PERMISSIONS: Permissões
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Principal
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'Exportar para CSV'
diff --git a/lang/ro.yml b/lang/ro.yml
index 1bfcfcb04..ca2dc2d42 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -3,9 +3,10 @@ ro:
     ENTERINFO: 'Vă rugăm introduceţi un utilizator și o parolă.'
     ERRORNOTADMIN: 'Acest utilizator nu este un administrator.'
     ERRORNOTREC: 'Numele utilizator sau parola este nerecunoscută'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Ti-ai schimbat parola in'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Salut
+    TEXT2: 'link de resetare a parolei'
+    TEXT3: pentru
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Parola trebuie să conțină cel puțin {min} caractere.'
     BETWEEN: 'Parola trebuie să conțină între {min} și {max} caractere.'
@@ -15,18 +16,10 @@ ro:
     TODAY: astăzi
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Alege)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Oricare
-  ForgotPasswordEmail_ss:
-    HELLO: Salut
-    TEXT2: 'link de resetare a parolei'
-    TEXT3: pentru
   SilverStripe\Forms\GridField\GridField:
-    Filter: Filtru
-    Find: Gaseste
-    PRINTEDAT: 'Imprimat la'
-    PRINTEDBY: 'Imprimat de'
-    ResetFilter: Reseteaza
+    CSVEXPORT: 'Exportati ca CSV'
   SilverStripe\Security\Group:
     Code: 'Cod Grup'
     Locked: 'Blocat?'
@@ -62,7 +55,5 @@ ro:
     GROUPNAME: 'Numele grupului'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Pincipal
-  TableListField:
-    CSVEXPORT: 'Exportati ca CSV'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     EDITINFO: 'Editeaza acest fisier'
diff --git a/lang/ru.yml b/lang/ru.yml
index 9c2198e6f..5859c39af 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -1,5 +1,5 @@
 ru:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Первая загрузка'
     HEIGHT: Высота
     LASTEDIT: 'Последнее изменение'
@@ -11,7 +11,7 @@ ru:
     ENTERINFO: 'Пожалуйста, введите имя пользователя и пароль.'
     ERRORNOTADMIN: 'Такой пользователь не является администратором.'
     ERRORNOTREC: 'Такое имя пользователя или пароль не существует'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Все
     NOANSWER: Нет
     YESANSWER: Да
@@ -27,10 +27,11 @@ ru:
     SUCCESSCONTENT: '<p>Вы вошли в систему. Если вы не были автоматически перенаправлены <a target="_top" href="{link}">нажмите здесь</a></p>'
     TimedOutTitleAnonymous: 'Время вашего сеанса истекло.'
     TimedOutTitleMember: '{name}!<br />Время вашего сеанса истекло.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Вы изменили свой пароль на'
-    CHANGEPASSWORDTEXT3: 'Изменить пароль'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Здравствуйте
+    TEXT1: 'Это ваша'
+    TEXT2: 'ссылка переустановки пароля'
+    TEXT3: для
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Нет
     YESANSWER: Да
@@ -44,7 +45,7 @@ ru:
     SHOWONCLICKTITLE: 'Изменить пароль'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'меньше минуты'
     TIMEDIFFAGO: '{difference} назад'
     TIMEDIFFIN: 'через {difference}'
@@ -62,13 +63,8 @@ ru:
     SOURCE_VALIDATION: 'Выберите значение из списка. Ошибочно указано значение: {value}'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Пожалуйста, задайте адрес email.'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Любой
-  ForgotPasswordEmail_ss:
-    HELLO: Здравствуйте
-    TEXT1: 'Это ваша'
-    TEXT2: 'ссылка переустановки пароля'
-    TEXT3: для
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Срок действия сеанса истек. Пожалуйста, отправьте данные формы еще раз.'
     CSRF_FAILED_MESSAGE: 'Произошла техническая ошибка. Нажмите кнопку "Назад", обновите страницу в браузере и повторите попытку.'
@@ -80,27 +76,11 @@ ru:
     VALIDCURRENCY: 'Пожалуйста, укажите валюту правильно'
   SilverStripe\Forms\FormField:
     NONE: 'не выбрано'
-  GridAction:
-    DELETE_DESCRIPTION: Удалить
-    Delete: Удалить
-    UnlinkRelation: 'Отменить связь'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Добавить {name}'
-    Filter: Фильтр
-    FilterBy: 'Фильтр по'
-    Find: Найти
-    LinkExisting: Связать
-    NewRecord: 'Новый(-ая) %s'
-    NoItemsFound: 'Элементов не найдено'
-    PRINTEDAT: 'Когда распечатано:'
-    PRINTEDBY: 'Кем распечатано:'
-    PlaceHolder: 'Найти {type}'
-    PlaceHolderWithLabels: 'Найти {type} по {name}'
-    RelationSearch: 'Поиск отношений'
-    ResetFilter: Сброс
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Нет прав на удаление'
     EditPermissionsFailure: 'Не достаточно прав для удаления записи'
+  SilverStripe\Forms\GridField\GridField:
+    OF: из
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Отмена
     Create: Создать
@@ -108,7 +88,7 @@ ru:
     DeletePermissionsFailure: 'Нет прав на удаление'
     Deleted: 'Удалено %s %s'
     Save: 'Сохранить'
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: 'Редактировать'
   SilverStripe\Security\Group:
     PLURALNAME: Группы
@@ -186,7 +166,7 @@ ru:
     IsNullLabel: Недействительно
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' - не числовое значение; для этого поля допустимы только числовые значения'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Страница
     View: Просмотр
   SilverStripe\Security\PasswordValidator:
@@ -194,8 +174,7 @@ ru:
     PREVPASSWORD: 'Вы уже использовали этот пароль прежде. Пожалуйста, выберите новый пароль.'
     TOOSHORT: 'Слишком короткий пароль, минимальная длина - %s символов'
   SilverStripe\Security\Permission:
-    PLURALNAME: 'Права доступа'
-    SINGULARNAME: 'Право доступа'
+    UserPermissionsIntro: 'При включении этого пользователя в определенную группу его права доступа будут изменены соответствующим образом. Более подробные сведения о правах доступа для отдельных групп содержатся в разделе "Группы".'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'присвоено "{title}"'
     FromGroup: 'перенято от группы "{title}"'
@@ -207,8 +186,6 @@ ru:
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: 'Коды ролей доступа'
     SINGULARNAME: 'Код роли доступа'
-  Permissions:
-    UserPermissionsIntro: 'При включении этого пользователя в определенную группу его права доступа будут изменены соответствующим образом. Более подробные сведения о правах доступа для отдельных групп содержатся в разделе "Группы".'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Пожалуйста, введите верный номер телефона'
   SilverStripe\Security\Security:
@@ -240,14 +217,9 @@ ru:
     SINGULARNAME: Пароль
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Основное
-  TableListField:
-    CSVEXPORT: 'Экспорт в CSV'
-    Print: Печать
-  TableListField_PageControls_ss:
-    OF: из
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Пожалуйста, задайте верный формат времени {format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: 'Размеры'
     EDIT: 'Редактировать'
     EDITINFO: 'Редактировать этот файл'
diff --git a/lang/si.yml b/lang/si.yml
index e61557390..42156889a 100644
--- a/lang/si.yml
+++ b/lang/si.yml
@@ -1,5 +1,5 @@
 si:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'පලමු ලිපිය අප්ලෝඩ් කරන ලදී'
     LASTEDIT: 'අවසාන ලිපිය වෙනස්  කරන ලදී'
     SIZE: තරම
@@ -8,17 +8,14 @@ si:
     ENTERINFO: 'නම හා මුර පදය ඇතුල් කරන්න'
     ERRORNOTADMIN: 'ඵම පරිශීලකයා නියමුවෙකු නොවේ'
     ERRORNOTREC: 'ඵම නම/මුරපදය හදුනාගත නොහැක'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'අලුත් මුර පදය'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: කොහොමද
+    TEXT1: 'මෙය ඔබගේ'
+    TEXT3: සඳහා
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: 'මුර පදය වෙනස් කිරීම'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (තොරන්න)
-  ForgotPasswordEmail_ss:
-    HELLO: කොහොමද
-    TEXT1: 'මෙය ඔබගේ'
-    TEXT3: සඳහා
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'මුර පද අසමානය'
     VALIDATIONPASSWORDSNOTEMPTY: 'මුර පදය විය නොහැක'
diff --git a/lang/sk.yml b/lang/sk.yml
index 7589d1781..19dbea8b6 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -1,5 +1,5 @@
 sk:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Prvýkrát nahrané'
     HEIGHT: Výška
     LASTEDIT: 'Posledne zmenené'
@@ -11,7 +11,7 @@ sk:
     ENTERINFO: 'Prosím zadajte používateľské meno a heslo.'
     ERRORNOTADMIN: 'Tento používateľ nie je administrátor.'
     ERRORNOTREC: 'Toto používateľské meno / heslo nebolo rozpoznané'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Ktorýkoľvek
     NOANSWER: Nie
     YESANSWER: Áno
@@ -27,11 +27,11 @@ sk:
     SUCCESSCONTENT: '<p>Úspešné prihlásenie. Ak nebudete automaticky presmerovaní <a target="_top" href="{link}">kliknite tu</a></p>'
     TimedOutTitleAnonymous: 'Čas Vášho sedenia vypršal.'
     TimedOutTitleMember: 'Ahoj {name}!<br />Čas Vášho sedenia vypršal.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDFOREMAIL: 'Heslo pre účet s e-mailovou adresou {email} bol zmenené. Ak ste nechceli zmeniť vaše heslo, prosím zmeňte ho pomocou odkazu uvedeného nižšie.'
-    CHANGEPASSWORDTEXT1: 'Vaše heslo bolo zmenené pre'
-    CHANGEPASSWORDTEXT3: 'Zmeniť heslo'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: 'Dobrý deň'
+    TEXT1: 'Tu je váš'
+    TEXT2: 'odkaz na resetovanie hesla'
+    TEXT3: pre
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Nie
     YESANSWER: Áno
@@ -45,7 +45,7 @@ sk:
     SHOWONCLICKTITLE: 'Zmeniť heslo'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'menej ako minúta'
     TIMEDIFFAGO: '{difference} pred'
     TIMEDIFFIN: 'v {difference}'
@@ -63,13 +63,8 @@ sk:
     SOURCE_VALIDATION: 'Prosím vyberte hodnotu v zozname. {value} nie je platná voľba'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Prosím zadajte email adresu'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Každý
-  ForgotPasswordEmail_ss:
-    HELLO: 'Dobrý deň'
-    TEXT1: 'Tu je váš'
-    TEXT2: 'odkaz na resetovanie hesla'
-    TEXT3: pre
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Čas Vášho sedenia vypršal. Prosím znova odošlite formulár.'
     CSRF_FAILED_MESSAGE: 'Zdá sa, že nastal technický problém. Kliknite prosím na tlačítko späť, obnovte váš prehliadač, a skúste to opäť.'
@@ -81,27 +76,11 @@ sk:
     VALIDCURRENCY: 'Prosím zadajte platnú menu'
   SilverStripe\Forms\FormField:
     NONE: žiadne
-  GridAction:
-    DELETE_DESCRIPTION: Zmazať
-    Delete: Zmazať
-    UnlinkRelation: Odpojiť
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Pridať {name}'
-    Filter: Filter
-    FilterBy: 'Filtrovať podľa'
-    Find: Vyhľadať
-    LinkExisting: 'Prepojenie existujúcich'
-    NewRecord: 'Nový %s'
-    NoItemsFound: 'Žiadne položky'
-    PRINTEDAT: 'Vytlačené v'
-    PRINTEDBY: Vytlačené
-    PlaceHolder: 'Vyhľadať {type}'
-    PlaceHolderWithLabels: 'Vyhľadať {type} podľa {name}'
-    RelationSearch: 'Vzťah hľadania'
-    ResetFilter: Reset
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Žiadne oprávnenia zmazať'
     EditPermissionsFailure: 'Žiadne oprávnenie pre odpojenie záznamu'
+  SilverStripe\Forms\GridField\GridField:
+    OF: z
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Zrušiť
     Create: Vytvoriť
@@ -109,7 +88,7 @@ sk:
     DeletePermissionsFailure: 'Žiadne oprávnenia zmazať'
     Deleted: 'Zmazané %s %s'
     Save: Uložiť
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Editovať
   SilverStripe\Security\Group:
     PLURALNAME: Skupiny
@@ -187,7 +166,7 @@ sk:
     IsNullLabel: 'Je Null'
   SilverStripe\Forms\NumericField:
     VALIDATION: 'Zadaná hodnota ''{value}'' nie je číslo. Iba čísla môžu byť akceptované pre toto pole!'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Stránka
     View: Zobraziť
   SilverStripe\Security\PasswordValidator:
@@ -195,8 +174,7 @@ sk:
     PREVPASSWORD: 'Už ste použili toto heslo v minulosti, vyberte nové hoslo, prosím'
     TOOSHORT: 'Heslo je príliš krátke, musí byť %s alebo viacej znakov dlhé'
   SilverStripe\Security\Permission:
-    PLURALNAME: Oprávnenia
-    SINGULARNAME: Oprávnenie
+    UserPermissionsIntro: 'Priradenie skupín tomuto užívateľovi upraví oprávnenia, ktoré má. Pozri sekcia skupiny pre podrobnosti o oprávneniach k jednotlivým skupinám.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'pripojené k "{title}"'
     FromGroup: 'zdedené zo skupiny "{title}"'
@@ -208,8 +186,6 @@ sk:
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: 'Kódy oprávnenia role'
     SINGULARNAME: 'Kód oprávnenia role'
-  Permissions:
-    UserPermissionsIntro: 'Priradenie skupín tomuto užívateľovi upraví oprávnenia, ktoré má. Pozri sekcia skupiny pre podrobnosti o oprávneniach k jednotlivým skupinám.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Prosím zadajte platné telefónne číslo'
   SilverStripe\Security\Security:
@@ -241,15 +217,9 @@ sk:
     SINGULARNAME: 'Heslo člena'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Hlavné
-  TableListField:
-    CSVEXPORT: 'Exportovať do CSV'
-    CSVIMPORT: 'Import CSV'
-    Print: Tlačiť
-  TableListField_PageControls_ss:
-    OF: z
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Prosím zadajte platný formát času ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Rozmery
     EDIT: Editovať
     EDITINFO: 'Editovať súbor'
diff --git a/lang/sl.yml b/lang/sl.yml
index 5d025735b..b936530f4 100644
--- a/lang/sl.yml
+++ b/lang/sl.yml
@@ -1,5 +1,5 @@
 sl:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Naloženo na začetku'
     LASTEDIT: 'Zadnje naloženo'
     SIZE: 'Velikost datoteke'
@@ -9,17 +9,19 @@ sl:
     ENTERINFO: 'Vpišite uporabniško ime in geslo.'
     ERRORNOTADMIN: 'Uporabnik ni administrator tega spletnega mesta.'
     ERRORNOTREC: 'Ne prepoznam uporabniškega imena ali gesla'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Katerikoli
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Geslo ste spremenili v'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: 'Pozdravljeni,'
+    TEXT1: 'Tukaj je vaša'
+    TEXT2: 'povezava za ponastavitev gesla'
+    TEXT3: za
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Geslo mora vsebovati vsaj {min} znakov.'
     BETWEEN: 'Geslo mora biti dolgo od {min} do {max} znakov.'
     MAXIMUM: 'Geslo je lahko dolgo največ {max} znakov.'
     SHOWONCLICKTITLE: 'Spremeni geslo'
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'manj kot minuta'
     TIMEDIFFAGO: 'pred {difference}'
     TIMEDIFFIN: 'v {difference}'
@@ -35,13 +37,8 @@ sl:
     CHOOSE: (Izberi)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Prosim, vpišite e-naslov.'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Katerikoli
-  ForgotPasswordEmail_ss:
-    HELLO: 'Pozdravljeni,'
-    TEXT1: 'Tukaj je vaša'
-    TEXT2: 'povezava za ponastavitev gesla'
-    TEXT3: za
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Vaša seja je potekla. Prosimo ponovno oddajte obrazec '
     VALIDATIONPASSWORDSDONTMATCH: 'Vpisani gesli se ne ujemata'
@@ -51,26 +48,10 @@ sl:
     VALIDCURRENCY: 'Prosim, vnesite pravo valuto.'
   SilverStripe\Forms\FormField:
     NONE: brez
-  GridAction:
-    DELETE_DESCRIPTION: Izbriši
-    Delete: Izbriši
-    UnlinkRelation: 'Odstrani povezavo'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Dodaj {name}'
-    Filter: Filter
-    FilterBy: 'Filtriraj po'
-    Find: Poišči
-    LinkExisting: 'Poveži na'
-    NewRecord: 'Novih %s'
-    NoItemsFound: 'Ni rezultatov'
-    PRINTEDAT: 'Tiskano pri'
-    PRINTEDBY: Natisnil
-    PlaceHolder: 'Poišči {type} '
-    PlaceHolderWithLabels: 'Poišči {type} glede na {name}'
-    RelationSearch: 'Povezano iskanje'
-    ResetFilter: Ponastavi
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Ni dovoljenja za brisanje'
+  SilverStripe\Forms\GridField\GridField:
+    OF: od
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Prekliči
     Create: Ustvari
@@ -78,7 +59,7 @@ sl:
     DeletePermissionsFailure: 'Ni dovoljenja za brisanje'
     Deleted: 'Izbrisanih %s %s'
     Save: Shrani
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Uredi
   SilverStripe\Security\Group:
     AddRole: 'Skupinam pripiši vloge'
@@ -149,7 +130,7 @@ sl:
     IsNullLabel: 'Prazno polje'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' ni številka. V to polje lahko vnesete samo številke.'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Stran
     View: Poglej
   SilverStripe\Security\Permission:
@@ -186,14 +167,9 @@ sl:
     ROLESDESCRIPTION: 'Tukaj lahko skupini dodajate vloge. Vloge so logični sklopi dovoljenj, ki jih urejate v zavihku "Vloge".'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Domov
-  TableListField:
-    CSVEXPORT: 'Izvozi kot CSV-datoteko'
-    Print: Natisni
-  TableListField_PageControls_ss:
-    OF: od
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Prosim, vnesite čas v ustrezni obliki ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimenzije
     EDIT: Uredi
     EDITINFO: 'Uredi datoteko'
diff --git a/lang/sl_SI.yml b/lang/sl_SI.yml
index 6e4ee4ec9..e56931a1d 100644
--- a/lang/sl_SI.yml
+++ b/lang/sl_SI.yml
@@ -1,5 +1,5 @@
 sl_SI:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     HEIGHT: Višina
     LASTEDIT: 'Nazadnje spremenjeno'
     SIZE: 'Velikost datoteke'
@@ -10,7 +10,7 @@ sl_SI:
     ENTERINFO: 'Prosimo vpišite uporabniško ime in geslo.'
     ERRORNOTADMIN: 'Ta uporabnik ni administrator.'
     ERRORNOTREC: 'Uporabniško ime ali geslo je neveljavno'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     NOANSWER: Ne
     YESANSWER: Da
   SilverStripe\Security\CMSMemberLoginForm:
@@ -20,10 +20,11 @@ sl_SI:
   SilverStripe\Security\CMSSecurity:
     TimedOutTitleAnonymous: 'Vaša seja je potekla.'
     TimedOutTitleMember: 'Hej {name}! Tvoja seja je potekla.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Zamenjali ste geslo za'
-    CHANGEPASSWORDTEXT3: 'Zamenjaj geslo'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Živjo
+    TEXT1: 'Tukaj je vaša'
+    TEXT2: 'povezava za resetiranje gesla'
+    TEXT3: za
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Ne
     YESANSWER: Da
@@ -31,7 +32,7 @@ sl_SI:
     SHOWONCLICKTITLE: 'Zamenjaj geslo'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: €
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'manj kot minuto'
   SilverStripe\Forms\DateField:
     NOTSET: 'ni nastavljeno'
@@ -43,22 +44,12 @@ sl_SI:
     CHOOSE: (Izberi)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Prosimo vtipkajte e-poštni naslov'
-  ForgotPasswordEmail_ss:
-    HELLO: Živjo
-    TEXT1: 'Tukaj je vaša'
-    TEXT2: 'povezava za resetiranje gesla'
-    TEXT3: za
-  GridAction:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DELETE_DESCRIPTION: Izbriši
     Delete: Izbriši
     UnlinkRelation: 'Odstrani povezavo'
   SilverStripe\Forms\GridField\GridField:
-    Add: 'Dodaj {name}'
-    Filter: Filter
-    FilterBy: 'Filtriraj po'
-    Find: Najdi
-    NewRecord: 'Nov %s'
-    ResetFilter: Resetiraj
+    OF: od
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Prekliči
     Create: Ustvari
@@ -66,7 +57,7 @@ sl_SI:
     DeletePermissionsFailure: 'Nimate pravic za brisanje'
     Deleted: 'Izbrisano %s %s'
     Save: Shrani
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Uredi
   SilverStripe\Security\Group:
     AddRole: 'Dodaj vlogo za to skupino'
@@ -137,12 +128,7 @@ sl_SI:
     MEMBERS: Uporabniki
     PERMISSIONS: Dovoljenja
     ROLES: Vloge
-  TableListField:
-    CSVEXPORT: 'Izvozi v CSV'
-    Print: Natisni
-  TableListField_PageControls_ss:
-    OF: od
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimenzije
     EDIT: Uredi
     EDITINFO: 'Uredi datoteko'
diff --git a/lang/sr.yml b/lang/sr.yml
index 83139ab24..db53e5ac6 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -1,5 +1,5 @@
 sr:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Прво достављено'
     LASTEDIT: 'Последње промењено'
     SIZE: Величина
@@ -9,11 +9,13 @@ sr:
     ENTERINFO: 'Унесите корисничко име и лозинку.'
     ERRORNOTADMIN: 'Овај корисник није администратор.'
     ERRORNOTREC: 'То корисничко име / лозинка није препознато'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Било која'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Променили сте своју лозинку за '
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Здраво
+    TEXT1: 'Ево га Ваш'
+    TEXT2: 'линк за ресетовање лозинке'
+    TEXT3: за
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Лозинка мора садржати најмање {min} знакова.'
     BETWEEN: 'Лозинка мора садржати најмање {min}, а највише {max} знакова.'
@@ -21,7 +23,7 @@ sr:
     SHOWONCLICKTITLE: 'Промени лозинку'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: дин.
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'мање од минуте'
     TIMEDIFFAGO: '{difference} раније'
     TIMEDIFFIN: 'кроз {difference}'
@@ -37,13 +39,8 @@ sr:
     CHOOSE: (изаберите)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Унесите адресу е-поште'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 'Било који'
-  ForgotPasswordEmail_ss:
-    HELLO: Здраво
-    TEXT1: 'Ево га Ваш'
-    TEXT2: 'линк за ресетовање лозинке'
-    TEXT3: за
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Лозинке се не поклапају'
     VALIDATIONPASSWORDSNOTEMPTY: 'Поља за лозинке не смеју да буду празна'
@@ -52,27 +49,11 @@ sr:
     VALIDCURRENCY: 'Унесите исправну валуту'
   SilverStripe\Forms\FormField:
     NONE: без
-  GridAction:
-    DELETE_DESCRIPTION: Избриши
-    Delete: Избриши
-    UnlinkRelation: 'Раскини линк'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Додај {name}'
-    Filter: Филтер
-    FilterBy: 'Филтрирај по'
-    Find: Пронађи
-    LinkExisting: 'Постојање линка'
-    NewRecord: 'Нови %s'
-    NoItemsFound: 'Ниједна ставка није пронађена'
-    PRINTEDAT: Одштампано
-    PRINTEDBY: Одштампао
-    PlaceHolder: 'Пронађи {type}'
-    PlaceHolderWithLabels: 'Пронађи {type} по {name}'
-    RelationSearch: 'Претраживање релације'
-    ResetFilter: 'Врати у пређашње стање'
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Немате дозволу за брисање'
     EditPermissionsFailure: 'Немате дозволу да раскинете линк са записом'
+  SilverStripe\Forms\GridField\GridField:
+    OF: од
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Одустани
     Create: Креирај
@@ -80,7 +61,7 @@ sr:
     DeletePermissionsFailure: 'Немате право брисања'
     Deleted: 'Избрисано %s %s'
     Save: Сачувај
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Измени
   SilverStripe\Security\Group:
     AddRole: 'Додај улогу за ову групу'
@@ -157,7 +138,7 @@ sr:
     IsNullLabel: 'је Null'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' није број. Само бројеви могу бити прихваћени за ово поље'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Страница
     View: Преглед
   SilverStripe\Security\PasswordValidator:
@@ -165,9 +146,7 @@ sr:
     PREVPASSWORD: 'Већ сте користили наведену лозинку у прошлости. Стога, изаберите другу лозинку'
     TOOSHORT: 'Лозинка је прекратка. Лозинка мора садржати бар %s знакова'
   SilverStripe\Security\Permission:
-    AdminGroup: Администратор
-    FULLADMINRIGHTS: 'Пуна административна права'
-    FULLADMINRIGHTS_HELP: 'Надјачава све друге додељене дозволе.'
+    UserPermissionsIntro: 'Додавањем овог корисника у групу биће прилагођена и његова права приступа. Подробнија објашњења о правима приступа за појединачне групе можете пронаћи у секцији "Групе".'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'додељено "{title}"'
     FromGroup: 'наслеђено од групе "{title}"'
@@ -178,8 +157,6 @@ sr:
     Title: Наслов
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Није могуће доделити кôд  "%s" са привилегованим дозволама (захтева Администраторски приступ)'
-  Permissions:
-    UserPermissionsIntro: 'Додавањем овог корисника у групу биће прилагођена и његова права приступа. Подробнија објашњења о правима приступа за појединачне групе можете пронаћи у секцији "Групе".'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Унесите исправан број телефона'
   SilverStripe\Security\Security:
@@ -204,14 +181,9 @@ sr:
     ROLESDESCRIPTION: 'Улоге су предефинисани скупови овлашћења и могу бити додељене групама.<br />Наслеђују се од родитељских група ако је потребно.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Главно
-  TableListField:
-    CSVEXPORT: 'Извези у CSV'
-    Print: Штампај
-  TableListField_PageControls_ss:
-    OF: од
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Унесите исправан формат времена ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Димензије
     EDIT: Измени
     EDITINFO: 'Измени ову датотеку'
diff --git a/lang/sr@latin.yml b/lang/sr@latin.yml
index b715aea33..0b10946fa 100644
--- a/lang/sr@latin.yml
+++ b/lang/sr@latin.yml
@@ -1,5 +1,5 @@
 sr@latin:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Prvo dostavljeno'
     LASTEDIT: 'Poslednje promenjeno'
     SIZE: Veličina
@@ -9,11 +9,13 @@ sr@latin:
     ENTERINFO: 'Unesite korisničko ime i lozinku.'
     ERRORNOTADMIN: 'Ovaj korisnik nije administrator.'
     ERRORNOTREC: 'To korisničko ime / lozinka nije prepoznato'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Bilo koja'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Promenili ste svoju lozinku za '
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Zdravo
+    TEXT1: 'Evo ga Vaš'
+    TEXT2: 'link za resetovanje lozinke'
+    TEXT3: za
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Lozinka mora sadržati najmanje {min} znakova.'
     BETWEEN: 'Lozinka mora sadržati najmanje {min}, a najviše {max} znakova.'
@@ -21,7 +23,7 @@ sr@latin:
     SHOWONCLICKTITLE: 'Promeni lozinku'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: din.
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'manje od minute'
     TIMEDIFFAGO: '{difference} ranije'
     TIMEDIFFIN: 'kroz {difference}'
@@ -37,13 +39,8 @@ sr@latin:
     CHOOSE: (izaberite)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Unesite adresu e-pošte'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 'Bilo koji'
-  ForgotPasswordEmail_ss:
-    HELLO: Zdravo
-    TEXT1: 'Evo ga Vaš'
-    TEXT2: 'link za resetovanje lozinke'
-    TEXT3: za
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Lozinke se ne poklapaju'
     VALIDATIONPASSWORDSNOTEMPTY: 'Polja za lozinke ne smeju da budu prazna'
@@ -52,27 +49,11 @@ sr@latin:
     VALIDCURRENCY: 'Unesite ispravnu valutu'
   SilverStripe\Forms\FormField:
     NONE: bez
-  GridAction:
-    DELETE_DESCRIPTION: Izbriši
-    Delete: Izbriši
-    UnlinkRelation: 'Raskini link'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Dodaj {name}'
-    Filter: Filter
-    FilterBy: 'Filtriraj po'
-    Find: Pronađi
-    LinkExisting: 'Postojanje linka'
-    NewRecord: 'Novi %s'
-    NoItemsFound: 'Nijedna stavka nije pronađena'
-    PRINTEDAT: Odštampano
-    PRINTEDBY: Odštampao
-    PlaceHolder: 'Pronađi {type}'
-    PlaceHolderWithLabels: 'Pronađi {type} po {name}'
-    RelationSearch: 'Pretraživanje relacije'
-    ResetFilter: 'Vrati u pređašnje stanje'
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Nemate dozvolu za brisanje'
     EditPermissionsFailure: 'Nemate dozvolu da raskinete link sa zapisom'
+  SilverStripe\Forms\GridField\GridField:
+    OF: od
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Odustani
     Create: Kreiraj
@@ -80,7 +61,7 @@ sr@latin:
     DeletePermissionsFailure: 'Nemate pravo brisanja'
     Deleted: 'Izbrisano %s %s'
     Save: Sačuvaj
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Izmeni
   SilverStripe\Security\Group:
     AddRole: 'Dodaj ulogu za ovu grupu'
@@ -157,7 +138,7 @@ sr@latin:
     IsNullLabel: 'je Null'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' nije broj. Samo brojevi mogu biti prihvaćeni za ovo polje'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Stranica
     View: Pregled
   SilverStripe\Security\PasswordValidator:
@@ -165,9 +146,7 @@ sr@latin:
     PREVPASSWORD: 'Već ste koristili navedenu lozinku u prošlosti. Stoga, izaberite drugu lozinku'
     TOOSHORT: 'Lozinka je prekratka. Lozinka mora sadržati bar %s znakova'
   SilverStripe\Security\Permission:
-    AdminGroup: Administrator
-    FULLADMINRIGHTS: 'Puna administrativna prava'
-    FULLADMINRIGHTS_HELP: 'Nadjačava sve druge dodeljene dozvole.'
+    UserPermissionsIntro: 'Dodavanjem ovog korisnika u grupu biće prilagođena i njegova prava pristupa. Podrobnija objašnjenja o pravima pristupa za pojedinačne grupe možete pronaći u sekciji "Grupe".'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'dodeljeno "{title}"'
     FromGroup: 'nasleđeno od grupe "{title}"'
@@ -178,8 +157,6 @@ sr@latin:
     Title: Naslov
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Nije moguće dodeliti kôd  "%s" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
-  Permissions:
-    UserPermissionsIntro: 'Dodavanjem ovog korisnika u grupu biće prilagođena i njegova prava pristupa. Podrobnija objašnjenja o pravima pristupa za pojedinačne grupe možete pronaći u sekciji "Grupe".'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Unesite ispravan broj telefona'
   SilverStripe\Security\Security:
@@ -204,14 +181,9 @@ sr@latin:
     ROLESDESCRIPTION: 'Uloge su predefinisani skupovi ovlašćenja i mogu biti dodeljene grupama.<br />Nasleđuju se od roditeljskih grupa ako je potrebno.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Glavno
-  TableListField:
-    CSVEXPORT: 'Izvezi u CSV'
-    Print: 'Štampaj'
-  TableListField_PageControls_ss:
-    OF: od
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Unesite ispravan format vremena ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimenzije
     EDIT: Izmeni
     EDITINFO: 'Izmeni ovu datoteku'
diff --git a/lang/sr_RS.yml b/lang/sr_RS.yml
index 9e70f5978..3af165670 100644
--- a/lang/sr_RS.yml
+++ b/lang/sr_RS.yml
@@ -1,5 +1,5 @@
 sr_RS:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Прво достављено'
     LASTEDIT: 'Последње промењено'
     SIZE: Величина
@@ -9,11 +9,13 @@ sr_RS:
     ENTERINFO: 'Унесите корисничко име и лозинку.'
     ERRORNOTADMIN: 'Овај корисник није администратор.'
     ERRORNOTREC: 'То корисничко име / лозинка није препознато'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Било која'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Променили сте своју лозинку за '
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Здраво
+    TEXT1: 'Ево га Ваш'
+    TEXT2: 'линк за ресетовање лозинке'
+    TEXT3: за
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Лозинка мора садржати најмање {min} знакова.'
     BETWEEN: 'Лозинка мора садржати најмање {min}, а највише {max} знакова.'
@@ -21,7 +23,7 @@ sr_RS:
     SHOWONCLICKTITLE: 'Промени лозинку'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: дин.
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'мање од минуте'
     TIMEDIFFAGO: '{difference} раније'
     TIMEDIFFIN: 'кроз {difference}'
@@ -37,13 +39,8 @@ sr_RS:
     CHOOSE: (изаберите)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Унесите адресу е-поште'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 'Било који'
-  ForgotPasswordEmail_ss:
-    HELLO: Здраво
-    TEXT1: 'Ево га Ваш'
-    TEXT2: 'линк за ресетовање лозинке'
-    TEXT3: за
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Лозинке се не поклапају'
     VALIDATIONPASSWORDSNOTEMPTY: 'Поља за лозинке не смеју да буду празна'
@@ -52,27 +49,11 @@ sr_RS:
     VALIDCURRENCY: 'Унесите исправну валуту'
   SilverStripe\Forms\FormField:
     NONE: без
-  GridAction:
-    DELETE_DESCRIPTION: Избриши
-    Delete: Избриши
-    UnlinkRelation: 'Раскини линк'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Додај {name}'
-    Filter: Филтер
-    FilterBy: 'Филтрирај по'
-    Find: Пронађи
-    LinkExisting: 'Постојање линка'
-    NewRecord: 'Нови %s'
-    NoItemsFound: 'Ниједна ставка није пронађена'
-    PRINTEDAT: Одштампано
-    PRINTEDBY: Одштампао
-    PlaceHolder: 'Пронађи {type}'
-    PlaceHolderWithLabels: 'Пронађи {type} по {name}'
-    RelationSearch: 'Претраживање релације'
-    ResetFilter: 'Врати у пређашње стање'
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Немате дозволу за брисање'
     EditPermissionsFailure: 'Немате дозволу да раскинете линк са записом'
+  SilverStripe\Forms\GridField\GridField:
+    OF: од
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Одустани
     Create: Креирај
@@ -80,7 +61,7 @@ sr_RS:
     DeletePermissionsFailure: 'Немате право брисања'
     Deleted: 'Избрисано %s %s'
     Save: Сачувај
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Измени
   SilverStripe\Security\Group:
     AddRole: 'Додај улогу за ову групу'
@@ -157,7 +138,7 @@ sr_RS:
     IsNullLabel: 'је Null'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' није број. Само бројеви могу бити прихваћени за ово поље'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Страница
     View: Преглед
   SilverStripe\Security\PasswordValidator:
@@ -165,9 +146,7 @@ sr_RS:
     PREVPASSWORD: 'Већ сте користили наведену лозинку у прошлости. Стога, изаберите другу лозинку'
     TOOSHORT: 'Лозинка је прекратка. Лозинка мора садржати бар %s знакова'
   SilverStripe\Security\Permission:
-    AdminGroup: Администратор
-    FULLADMINRIGHTS: 'Пуна административна права'
-    FULLADMINRIGHTS_HELP: 'Надјачава све друге додељене дозволе.'
+    UserPermissionsIntro: 'Додавањем овог корисника у групу биће прилагођена и његова права приступа. Подробнија објашњења о правима приступа за појединачне групе можете пронаћи у секцији "Групе".'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'додељено "{title}"'
     FromGroup: 'наслеђено од групе "{title}"'
@@ -178,8 +157,6 @@ sr_RS:
     Title: Наслов
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Није могуће доделити кôд  "%s" са привилегованим дозволама (захтева Администраторски приступ)'
-  Permissions:
-    UserPermissionsIntro: 'Додавањем овог корисника у групу биће прилагођена и његова права приступа. Подробнија објашњења о правима приступа за појединачне групе можете пронаћи у секцији "Групе".'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Унесите исправан број телефона'
   SilverStripe\Security\Security:
@@ -204,14 +181,9 @@ sr_RS:
     ROLESDESCRIPTION: 'Улоге су предефинисани скупови овлашћења и могу бити додељене групама.<br />Наслеђују се од родитељских група ако је потребно.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Главно
-  TableListField:
-    CSVEXPORT: 'Извези у CSV'
-    Print: Штампај
-  TableListField_PageControls_ss:
-    OF: од
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Унесите исправан формат времена ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Димензије
     EDIT: Измени
     EDITINFO: 'Измени ову датотеку'
diff --git a/lang/sr_RS@latin.yml b/lang/sr_RS@latin.yml
index eb89c3da8..d7801c050 100644
--- a/lang/sr_RS@latin.yml
+++ b/lang/sr_RS@latin.yml
@@ -1,5 +1,5 @@
 sr_RS@latin:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Prvo dostavljeno'
     LASTEDIT: 'Poslednje promenjeno'
     SIZE: Veličina
@@ -9,11 +9,13 @@ sr_RS@latin:
     ENTERINFO: 'Unesite korisničko ime i lozinku.'
     ERRORNOTADMIN: 'Ovaj korisnik nije administrator.'
     ERRORNOTREC: 'To korisničko ime / lozinka nije prepoznato'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Bilo koja'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Promenili ste svoju lozinku za '
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Zdravo
+    TEXT1: 'Evo ga Vaš'
+    TEXT2: 'link za resetovanje lozinke'
+    TEXT3: za
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Lozinka mora sadržati najmanje {min} znakova.'
     BETWEEN: 'Lozinka mora sadržati najmanje {min}, a najviše {max} znakova.'
@@ -21,7 +23,7 @@ sr_RS@latin:
     SHOWONCLICKTITLE: 'Promeni lozinku'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: din.
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'manje od minute'
     TIMEDIFFAGO: '{difference} ranije'
     TIMEDIFFIN: 'kroz {difference}'
@@ -37,13 +39,8 @@ sr_RS@latin:
     CHOOSE: (izaberite)
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Unesite adresu e-pošte'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 'Bilo koji'
-  ForgotPasswordEmail_ss:
-    HELLO: Zdravo
-    TEXT1: 'Evo ga Vaš'
-    TEXT2: 'link za resetovanje lozinke'
-    TEXT3: za
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Lozinke se ne poklapaju'
     VALIDATIONPASSWORDSNOTEMPTY: 'Polja za lozinke ne smeju da budu prazna'
@@ -52,27 +49,11 @@ sr_RS@latin:
     VALIDCURRENCY: 'Unesite ispravnu valutu'
   SilverStripe\Forms\FormField:
     NONE: bez
-  GridAction:
-    DELETE_DESCRIPTION: Izbriši
-    Delete: Izbriši
-    UnlinkRelation: 'Raskini link'
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Dodaj {name}'
-    Filter: Filter
-    FilterBy: 'Filtriraj po'
-    Find: Pronađi
-    LinkExisting: 'Postojanje linka'
-    NewRecord: 'Novi %s'
-    NoItemsFound: 'Nijedna stavka nije pronađena'
-    PRINTEDAT: Odštampano
-    PRINTEDBY: Odštampao
-    PlaceHolder: 'Pronađi {type}'
-    PlaceHolderWithLabels: 'Pronađi {type} po {name}'
-    RelationSearch: 'Pretraživanje relacije'
-    ResetFilter: 'Vrati u pređašnje stanje'
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Nemate dozvolu za brisanje'
     EditPermissionsFailure: 'Nemate dozvolu da raskinete link sa zapisom'
+  SilverStripe\Forms\GridField\GridField:
+    OF: od
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Odustani
     Create: Kreiraj
@@ -80,7 +61,7 @@ sr_RS@latin:
     DeletePermissionsFailure: 'Nemate pravo brisanja'
     Deleted: 'Izbrisano %s %s'
     Save: Sačuvaj
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Izmeni
   SilverStripe\Security\Group:
     AddRole: 'Dodaj ulogu za ovu grupu'
@@ -157,7 +138,7 @@ sr_RS@latin:
     IsNullLabel: 'je Null'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' nije broj. Samo brojevi mogu biti prihvaćeni za ovo polje'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Stranica
     View: Pregled
   SilverStripe\Security\PasswordValidator:
@@ -165,9 +146,7 @@ sr_RS@latin:
     PREVPASSWORD: 'Već ste koristili navedenu lozinku u prošlosti. Stoga, izaberite drugu lozinku'
     TOOSHORT: 'Lozinka je prekratka. Lozinka mora sadržati bar %s znakova'
   SilverStripe\Security\Permission:
-    AdminGroup: Administrator
-    FULLADMINRIGHTS: 'Puna administrativna prava'
-    FULLADMINRIGHTS_HELP: 'Nadjačava sve druge dodeljene dozvole.'
+    UserPermissionsIntro: 'Dodavanjem ovog korisnika u grupu biće prilagođena i njegova prava pristupa. Podrobnija objašnjenja o pravima pristupa za pojedinačne grupe možete pronaći u sekciji "Grupe".'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'dodeljeno "{title}"'
     FromGroup: 'nasleđeno od grupe "{title}"'
@@ -178,8 +157,6 @@ sr_RS@latin:
     Title: Naslov
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Nije moguće dodeliti kôd  "%s" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
-  Permissions:
-    UserPermissionsIntro: 'Dodavanjem ovog korisnika u grupu biće prilagođena i njegova prava pristupa. Podrobnija objašnjenja o pravima pristupa za pojedinačne grupe možete pronaći u sekciji "Grupe".'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Unesite ispravan broj telefona'
   SilverStripe\Security\Security:
@@ -204,14 +181,9 @@ sr_RS@latin:
     ROLESDESCRIPTION: 'Uloge su predefinisani skupovi ovlašćenja i mogu biti dodeljene grupama.<br />Nasleđuju se od roditeljskih grupa ako je potrebno.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Glavno
-  TableListField:
-    CSVEXPORT: 'Izvezi u CSV'
-    Print: 'Štampaj'
-  TableListField_PageControls_ss:
-    OF: od
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Unesite ispravan format vremena ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimenzije
     EDIT: Izmeni
     EDITINFO: 'Izmeni ovu datoteku'
diff --git a/lang/sv.yml b/lang/sv.yml
index 3fec2b340..60c290b3e 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -1,5 +1,5 @@
 sv:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Först uppladdad'
     HEIGHT: Höjd
     LASTEDIT: 'Senast ändrad'
@@ -11,7 +11,7 @@ sv:
     ENTERINFO: 'Var god ange användarnamn och lösenord'
     ERRORNOTADMIN: 'Den användaren är inte administratör'
     ERRORNOTREC: 'Användarnamnet / lösenordet hittas inte'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 'Vilken som helst'
     NOANSWER: Nej
     YESANSWER: Ja
@@ -27,10 +27,11 @@ sv:
     SUCCESSCONTENT: '<p>Inloggningen lyckades. <a target="_top" href="{link}">Klicka här</a> om du inte skickas vidare automatiskt.</p>'
     TimedOutTitleAnonymous: 'Din session har upphört.'
     TimedOutTitleMember: 'Hej {name}!<br />Din session har upphört.'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Du har ändrat ditt lösenord för'
-    CHANGEPASSWORDTEXT3: 'Ändra lösenord'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Hej
+    TEXT1: 'Här är din'
+    TEXT2: 'Återställningslänk för lösenord'
+    TEXT3: för
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Nej
     YESANSWER: Ja
@@ -43,7 +44,7 @@ sv:
     SHOWONCLICKTITLE: 'Ändra lösenord'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: $
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 'mindre än en minut'
     TIMEDIFFAGO: '{difference} sen'
     TIMEDIFFIN: 'om {difference}'
@@ -60,13 +61,8 @@ sv:
     SOURCE_VALIDATION: 'Vänligen välj att värde i listan. {value} är inget giltigt val'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Var snäll och ange en epostadress'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 'Vilken som helst'
-  ForgotPasswordEmail_ss:
-    HELLO: Hej
-    TEXT1: 'Här är din'
-    TEXT2: 'Återställningslänk för lösenord'
-    TEXT3: för
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Din session har upphört. Var god och skicka in formuläret på nytt.'
     CSRF_FAILED_MESSAGE: 'Ett tekniskt fel uppstod. Var god klicka på bakåt-knappen, ladda om sidan i webbläsaren och försök igen'
@@ -77,27 +73,11 @@ sv:
     VALIDCURRENCY: 'Var vänlig ange en korrekt valuta'
   SilverStripe\Forms\FormField:
     NONE: ingen
-  GridAction:
-    DELETE_DESCRIPTION: Radera
-    Delete: Radera
-    UnlinkRelation: Avlänka
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'Lägg till {name}'
-    Filter: Filtrera
-    FilterBy: 'Filtrera på'
-    Find: Hitta
-    LinkExisting: 'Länk finns'
-    NewRecord: 'Ny %s'
-    NoItemsFound: 'Inget hittades'
-    PRINTEDAT: Utskrivet
-    PRINTEDBY: 'Utskrivet av'
-    PlaceHolder: 'Hitta {type}'
-    PlaceHolderWithLabels: 'Hitta {type} efter {name}'
-    RelationSearch: Relationssökning
-    ResetFilter: Rensa
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: 'Rättighet för att radera saknas'
     EditPermissionsFailure: 'Rättigheter för avlänkning saknas'
+  SilverStripe\Forms\GridField\GridField:
+    OF: av
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Avbryt
     Create: Skapa
@@ -105,7 +85,7 @@ sv:
     DeletePermissionsFailure: 'Rättighet för att radera saknas'
     Deleted: 'Raderade %s %s'
     Save: Spara
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: Redigera
   SilverStripe\Security\Group:
     AddRole: 'Lägg till roll för den här gruppen'
@@ -183,7 +163,7 @@ sv:
     IsNullLabel: 'Är NULL'
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' är inget nummer, bara siffror (utan mellanslag) kan accepteras för det här fältet'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Sida
     View: Visa
   SilverStripe\Security\PasswordValidator:
@@ -191,9 +171,7 @@ sv:
     PREVPASSWORD: 'Du har redan använt samma lösenord tidigare, var god och välj ett nytt lösenord'
     TOOSHORT: 'Lösenordet är för kort, det måste innehålla %s eller fler tecken.'
   SilverStripe\Security\Permission:
-    AdminGroup: Administratör
-    FULLADMINRIGHTS: 'Fulla administrativa rättigheter'
-    FULLADMINRIGHTS_HELP: 'Implicerar och gäller över alla andra tillskrivna rättigheter.'
+    UserPermissionsIntro: 'Genom att välja grupper för denna användare så ändras användarens rättigheter. Gå till grupper för att se vilka rättigheter de olika grupperna har.'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: 'tilldelad till "{title}"'
     FromGroup: 'ärvde från grupp "{title}"'
@@ -204,8 +182,6 @@ sv:
     Title: Rollnamn
   SilverStripe\Security\PermissionRoleCode:
     PermsError: 'Koden "%s" kan inte ges privilegierad tillgång (adminrättigheter krävs)'
-  Permissions:
-    UserPermissionsIntro: 'Genom att välja grupper för denna användare så ändras användarens rättigheter. Gå till grupper för att se vilka rättigheter de olika grupperna har.'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: 'Var god ange ett giltigt telefonnummer'
   SilverStripe\Security\Security:
@@ -231,14 +207,9 @@ sv:
     ROLESDESCRIPTION: 'Roller är fördefinierade uppsättningar av tillstånd, och kan tilldelas grupper. <br/> De ärvs från föräldragrupper om det krävs.'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Allmän
-  TableListField:
-    CSVEXPORT: 'Exportera till CSV'
-    Print: 'Skriv ut'
-  TableListField_PageControls_ss:
-    OF: av
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: 'Var god att ange tid i ett giltigt format ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensioner
     EDIT: Ändra
     EDITINFO: 'Redigera filen'
diff --git a/lang/th.yml b/lang/th.yml
index cb99cc03e..f41be3037 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -1,5 +1,5 @@
 th:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: อัพโหลดครั้งแรก
     LASTEDIT: เปลี่ยนแปลงล่าสุด
     SIZE: ขนาด
@@ -7,11 +7,13 @@ th:
   SilverStripe\Security\BasicAuth:
     ENTERINFO: กรุณากรอกชื่อผู้ใช้และรหัสผ่าน
     ERRORNOTADMIN: ผู้ใช้งานรายดังกล่าวไม่ใช่ผู้ดูแลระบบ
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: ใดๆ
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: คุณได้เปลี่ยนรหัสผ่านสำหรับ
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: สวัสดี
+    TEXT1: นี่คือ
+    TEXT2: ลิงค์รีเซ็ตรหัสผ่าน
+    TEXT3: สำหรับ
   SilverStripe\Forms\ConfirmedPasswordField:
     BETWEEN: 'รหัสผ่านต้องมีความยาวตัวอักษรอย่างน้อย {min} ถึง {max} ตัวอักษร'
     SHOWONCLICKTITLE: เปลี่ยนรหัสผ่าน
@@ -24,37 +26,18 @@ th:
     CHOOSE: (เลือก)
   SilverStripe\Forms\EmailField:
     VALIDATION: กรุณากรอกที่อยู่อีเมล
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: ใดๆ
-  ForgotPasswordEmail_ss:
-    HELLO: สวัสดี
-    TEXT1: นี่คือ
-    TEXT2: ลิงค์รีเซ็ตรหัสผ่าน
-    TEXT3: สำหรับ
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: รหัสผ่านไม่ตรงกัน
     VALIDATIONPASSWORDSNOTEMPTY: รหัสผ่านไม่สามารถเว้นว่างได้
     VALIDCURRENCY: กรุณากรอกสกุลเงินที่ถูกต้อง
   SilverStripe\Forms\FormField:
     NONE: ไม่มี
-  GridAction:
-    DELETE_DESCRIPTION: ลบ
-    Delete: ลบ
-    UnlinkRelation: ยกเลิกการลิงก์
-  SilverStripe\Forms\GridField\GridField:
-    Add: 'เพิ่ม {name}'
-    Filter: ตัวกรองข้อมูล
-    FilterBy: กรองข้อมูลจาก
-    Find: ค้นหา
-    LinkExisting: ลิงก์ที่มีอยู่
-    NewRecord: 'ใหม่ %s'
-    NoItemsFound: ไม่พบรายการที่ต้องการ
-    PRINTEDAT: ถูกสั่งพิมพ์ที่
-    PRINTEDBY: พิมพ์โดย
-    PlaceHolder: 'ค้นหา {type}'
-    ResetFilter: รีเซ็ต
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: ไม่ได้รับสิทธิ์ให้ลบได้
+  SilverStripe\Forms\GridField\GridField:
+    OF: จาก
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: ยกเลิก
     Create: สร้าง
@@ -111,7 +94,7 @@ th:
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: จำนวน
     FIELDLABELCURRENCY: สกุลเงิน
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: หน้า
     View: เปิดดู
   SilverStripe\Security\Permission:
@@ -136,12 +119,7 @@ th:
     ROLES: บทบาท
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: หลัก
-  TableListField:
-    CSVEXPORT: 'ส่งข้อมูลออกเป็น CSV'
-    Print: พิมพ์
-  TableListField_PageControls_ss:
-    OF: จาก
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: ขนาดสัดส่วน
     EDIT: แก้ไข
     EDITINFO: แก้ไขไฟล์นี้
diff --git a/lang/tr.yml b/lang/tr.yml
index 586977866..55ebdea08 100644
--- a/lang/tr.yml
+++ b/lang/tr.yml
@@ -1,5 +1,5 @@
 tr:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Yüklenme tarihi'
     LASTEDIT: 'Güncellenme tarihi'
     SIZE: Boyutu
@@ -8,13 +8,15 @@ tr:
     ENTERINFO: 'Lütfen kullanıcı adı ve şifrenizi giriniz.'
     ERRORNOTADMIN: 'O kullanıcı, yönetici değildir'
     ERRORNOTREC: 'Kullanıcı adı / şifre hatalı'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: Herhangi
     NOANSWER: Hayır
     YESANSWER: Evet
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Parolanız değiştirildi:'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Merhaba
+    TEXT1: 'Profilinize ait'
+    TEXT2: 'şifre sıfırlama linki'
+    TEXT3: için
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Hayır
     YESANSWER: Evet
@@ -27,18 +29,13 @@ tr:
     TODAY: bugün
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Seçiniz)
-  ForgotPasswordEmail_ss:
-    HELLO: Merhaba
-    TEXT1: 'Profilinize ait'
-    TEXT2: 'şifre sıfırlama linki'
-    TEXT3: için
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Şifre tekrarı hatalı'
     VALIDATIONPASSWORDSNOTEMPTY: 'Şifreler boş geçilemez'
     VALIDATOR: 'Geçerlilik tespiti'
   SilverStripe\Forms\FormField:
     NONE: hiç
-  GridAction:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     Delete: Sil
   SilverStripe\Security\Group:
     Code: 'Grup Kodu'
@@ -104,8 +101,8 @@ tr:
     PERMISSIONS: İzinler
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: 'Ana (Esas)'
-  TableListField:
+  SilverStripe\Forms\GridField\GridField:
     CSVEXPORT: 'CSV olarak kaydet'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     EDITINFO: 'Dosyayı düzenle'
     FIELDNOTSET: 'Dosya bilgisi bulunamadı'
diff --git a/lang/uk.yml b/lang/uk.yml
index cf568e15d..41bd5ad49 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -1,5 +1,5 @@
 uk:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'Вперше завантажено'
     LASTEDIT: 'Востаннє змінено'
     SIZE: 'Розмір'
@@ -8,8 +8,7 @@ uk:
     ENTERINFO: 'Будь ласка, введіть ім''я користувача та пароль.'
     ERRORNOTADMIN: 'Цей користувач не є адміністратором.'
     ERRORNOTREC: 'Таке ім''я користувача / пароль не існує'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'Ви змінили свій пароль для'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: Привіт
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Пароль повинен містити що найменше {min} символів.'
@@ -21,18 +20,13 @@ uk:
     TODAY: сьогодні
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Оберіть)
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: Будь-який
-  ForgotPasswordEmail_ss:
-    HELLO: Привіт
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: 'Паролі не збігаються'
     VALIDATIONPASSWORDSNOTEMPTY: 'Паролі не можуть бути порожніми'
   SilverStripe\Forms\GridField\GridField:
-    Add: 'Додати {name}'
-    Filter: Фільтр
-    FilterBy: 'Фільтр по'
-    Find: Пошук
+    CSVEXPORT: 'Експортувати в CSV'
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: Відмінити
     Create: Створити
@@ -75,7 +69,7 @@ uk:
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Кількість
     FIELDLABELCURRENCY: Валюта
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: Сторінка
   SilverStripe\Security\PermissionCheckboxSetField:
     FromRoleOnGroup: 'Успадкований з ролі "%s" на групу "%s"'
@@ -99,7 +93,5 @@ uk:
     PERMISSIONS: Дозволи
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Головна
-  TableListField:
-    CSVEXPORT: 'Експортувати в CSV'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     EDITINFO: 'Редагувати цей файл'
diff --git a/lang/vi_VN.yml b/lang/vi_VN.yml
index 8c9a7540c..5e558035a 100644
--- a/lang/vi_VN.yml
+++ b/lang/vi_VN.yml
@@ -1,5 +1,5 @@
 vi_VN:
-  ChangePasswordEmail_ss:
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Bạn có thể thay đổi mật khẩu tại'
   SilverStripe\Forms\DateField:
     TODAY: 'hôm nay'
diff --git a/lang/zh.yml b/lang/zh.yml
index 8452bef46..509e9d5b1 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -1,5 +1,5 @@
 zh:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: '首先上传的'
     LASTEDIT: 最近更改的
     SIZE: 文件尺寸
@@ -9,7 +9,7 @@ zh:
     ENTERINFO: '请输入一个用户名和密码。'
     ERRORNOTADMIN: 那个用户不是一名管理员。
     ERRORNOTREC: '那个用户名 / 密码无法被辨认'
-  Boolean:
+  SilverStripe\ORM\FieldType\DBBoolean:
     ANY: 任何
     NOANSWER: 不是
     YESANSWER: 是
@@ -25,9 +25,11 @@ zh:
     SUCCESSCONTENT: '<p>登录成功。如果您没有自动重定向<a target="_top" href="{link}">点击此处</a></p>'
     TimedOutTitleAnonymous: '你的登陆超时已过期。'
     TimedOutTitleMember: '你好{name}!<br />你的登陆超时已过期。'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: '您的密码已更改为：'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: 您好
+    TEXT1: 这是您的
+    TEXT2: '密码重设链接'
+    TEXT3: 为
   SilverStripe\Forms\CheckboxField:
     NOANSWER: 不是
     YESANSWER: 是
@@ -38,7 +40,7 @@ zh:
     SHOWONCLICKTITLE: '更改密码'
   SilverStripe\Forms\CurrencyField:
     CURRENCYSYMBOL: 货币字符
-  Date:
+  SilverStripe\ORM\FieldType\DBDate:
     LessThanMinuteAgo: 少于一分钟
     TIMEDIFFAGO: '{difference} 以前'
     TIMEDIFFIN: '在 {difference} 中'
@@ -55,13 +57,8 @@ zh:
     SOURCE_VALIDATION: '请选择列表内提供的选项。{value}不是一个有效的选项'
   SilverStripe\Forms\EmailField:
     VALIDATION: '请输入一个电子邮件地址'
-  Enum:
+  SilverStripe\ORM\FieldType\DBEnum:
     ANY: 任何
-  ForgotPasswordEmail_ss:
-    HELLO: 您好
-    TEXT1: 这是您的
-    TEXT2: '密码重设链接'
-    TEXT3: 为
   SilverStripe\Forms\Form:
     CSRF_FAILED_MESSAGE: 似乎是一个技术问题。请点击返回按钮，刷新浏览器，然后再试一次。
     VALIDATIONPASSWORDSDONTMATCH: '密码不匹配'
@@ -71,27 +68,11 @@ zh:
     VALIDCURRENCY: '请输入一个有效的货币'
   SilverStripe\Forms\FormField:
     NONE: '无'
-  GridAction:
-    DELETE_DESCRIPTION: '删除'
-    Delete: '删除'
-    UnlinkRelation: 解除链接
-  SilverStripe\Forms\GridField\GridField:
-    Add: '添加 {name}'
-    Filter: 过滤器
-    FilterBy: 过滤条件
-    Find: 查找
-    LinkExisting: 链接已存在
-    NewRecord: '新 %s'
-    NoItemsFound: 没有找到任何项目
-    PRINTEDAT: 印刷地
-    PRINTEDBY: 印刷人
-    PlaceHolder: '查找 {type}'
-    PlaceHolderWithLabels: '通过 {name} 查找 {type}'
-    RelationSearch: '关系搜索'
-    ResetFilter: 重设
-  GridFieldAction_Delete:
+  SilverStripe\Forms\GridField\GridFieldDeleteAction:
     DeletePermissionsFailure: '没有删除权限'
     EditPermissionsFailure: 没有解除记录链接的权限
+  SilverStripe\Forms\GridField\GridField:
+    OF: 的
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     CancelBtn: 取消
     Create: 创建
@@ -99,7 +80,7 @@ zh:
     DeletePermissionsFailure: '没有删除权限'
     Deleted: '已删除的 %s %s'
     Save: 保存
-  GridFieldEditButton_ss:
+  SilverStripe\Forms\GridField\GridFieldEditButton.ss:
     EDIT: 编辑
   SilverStripe\Security\Group:
     AddRole: '在这个小组中添加一个角色'
@@ -177,7 +158,7 @@ zh:
     IsNullLabel: 为空
   SilverStripe\Forms\NumericField:
     VALIDATION: '''{value}'' 不是数字，该区域只接受数字'
-  Pagination:
+  SilverStripe\Forms\GridField\GridFieldPaginator_Row.ss:
     Page: 页面
     View: 查看
   SilverStripe\Security\PasswordValidator:
@@ -185,9 +166,7 @@ zh:
     PREVPASSWORD: '您已经使用过这个密码，请选用新的密码'
     TOOSHORT: '密码长度过短，必须为 %s 个字符或更长'
   SilverStripe\Security\Permission:
-    AdminGroup: 管理员
-    FULLADMINRIGHTS: '完全管理权'
-    FULLADMINRIGHTS_HELP: '包含并支配其它所有已分配权限'
+    UserPermissionsIntro: '把群组分配给该用户会改变其权限。请查看群组部分以获取关于个体组别的权限详情。'
   SilverStripe\Security\PermissionCheckboxSetField:
     AssignedTo: '已分配至 "{title}"'
     FromGroup: '从小组 "{title}"继承'
@@ -198,8 +177,6 @@ zh:
     Title: '标题'
   SilverStripe\Security\PermissionRoleCode:
     PermsError: '无法为代码 "%s"分配特权权限（要求具备 ADMIN 访问）'
-  Permissions:
-    UserPermissionsIntro: '把群组分配给该用户会改变其权限。请查看群组部分以获取关于个体组别的权限详情。'
   SilverStripe\Forms\PhoneNumberField:
     VALIDATION: '请输入一个有效的电话号码'
   SilverStripe\Security\Security:
@@ -225,14 +202,9 @@ zh:
     ROLESDESCRIPTION: '角色是预定义的权限，并可被分配到小组。<br />如果需要的话，它们可以从父小组继承。'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: 主要的
-  TableListField:
-    CSVEXPORT: '导出到 CSV'
-    Print: 打印
-  TableListField_PageControls_ss:
-    OF: 的
   SilverStripe\Forms\TimeField:
     VALIDATEFORMAT: '请输入有效的时间格式 ({format})'
-  UploadField:
+  SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: 尺寸
     EDIT: 编辑
     EDITINFO: 编辑该文件
diff --git a/lang/zh_CN.yml b/lang/zh_CN.yml
index 373334368..1683aeda7 100644
--- a/lang/zh_CN.yml
+++ b/lang/zh_CN.yml
@@ -1,5 +1,5 @@
 zh_CN:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: '第一次被上传'
     LASTEDIT: 上一次被更改
     SIZE: 大小
@@ -8,15 +8,12 @@ zh_CN:
     ENTERINFO: '请输入用户名和密码'
     ERRORNOTADMIN: 此用户没有管理员权限。
     ERRORNOTREC: '没有找到此用户名/密码'
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: '您已更改了登陆%s的密码'
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: 嗨
   SilverStripe\Forms\ConfirmedPasswordField:
     SHOWONCLICKTITLE: '更改密码'
   SilverStripe\Forms\DropdownField:
     CHOOSE: （选择）
-  ForgotPasswordEmail_ss:
-    HELLO: 嗨
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: '（密码相互不匹配）'
     VALIDATIONPASSWORDSNOTEMPTY: '密码不能空白'
diff --git a/lang/zh_TW.yml b/lang/zh_TW.yml
index bde15173e..c63797339 100644
--- a/lang/zh_TW.yml
+++ b/lang/zh_TW.yml
@@ -1,5 +1,5 @@
 zh_TW:
-  AssetTableField:
+  SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 第一次上傳
     LASTEDIT: 最後一次更新
     SIZE: 大小
@@ -8,13 +8,10 @@ zh_TW:
     ENTERINFO: '請輸入帳號密碼。'
     ERRORNOTADMIN: '那個使用者不是管理員。'
     ERRORNOTREC: 那組帳號密碼不對。
-  ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 您為這個帳戶改密碼：
+  SilverStripe\Control\Email\ChangePasswordEmail.ss:
     HELLO: 您好
   SilverStripe\Forms\DropdownField:
     CHOOSE: (選擇)
-  ForgotPasswordEmail_ss:
-    HELLO: 您好
   SilverStripe\Forms\Form:
     VALIDATIONPASSWORDSDONTMATCH: '密碼不相配'
     VALIDATIONPASSWORDSNOTEMPTY: 密碼不能是空的
diff --git a/src/Forms/FileUploadReceiver.php b/src/Forms/FileUploadReceiver.php
index 3a5a1e0d4..f937d5f73 100644
--- a/src/Forms/FileUploadReceiver.php
+++ b/src/Forms/FileUploadReceiver.php
@@ -289,7 +289,7 @@ trait FileUploadReceiver
         $fileObject = null;
 
         if (empty($tmpFile)) {
-            $error = _t('UploadField.FIELDNOTSET', 'File information not found');
+            $error = _t('SilverStripe\\AssetAdmin\\Forms\\UploadField.FIELDNOTSET', 'File information not found');
             return null;
         }
 
diff --git a/src/Forms/GridField/GridFieldDeleteAction.php b/src/Forms/GridField/GridFieldDeleteAction.php
index 3f8ff1cd6..0be50059f 100644
--- a/src/Forms/GridField/GridFieldDeleteAction.php
+++ b/src/Forms/GridField/GridFieldDeleteAction.php
@@ -128,7 +128,7 @@ class GridFieldDeleteAction implements GridField_ColumnProvider, GridField_Actio
                 array('RecordID' => $record->ID)
             )
                 ->addExtraClass('btn btn--no-text btn--icon-md font-icon-link-broken grid-field__icon-action gridfield-button-unlink')
-                ->setAttribute('title', _t('GridAction.UnlinkRelation', "Unlink"));
+                ->setAttribute('title', _t('SilverStripe\\Forms\\GridField\\GridFieldDeleteAction.UnlinkRelation', "Unlink"));
         } else {
             if (!$record->canDelete()) {
                 return null;
@@ -142,8 +142,8 @@ class GridFieldDeleteAction implements GridField_ColumnProvider, GridField_Actio
                 array('RecordID' => $record->ID)
             )
                 ->addExtraClass('gridfield-button-delete btn--icon-md font-icon-trash-bin btn--no-text grid-field__icon-action')
-                ->setAttribute('title', _t('GridAction.Delete', "Delete"))
-                ->setDescription(_t('GridAction.DELETE_DESCRIPTION', 'Delete'));
+                ->setAttribute('title', _t('SilverStripe\\Forms\\GridField\\GridFieldDeleteAction.Delete', "Delete"))
+                ->setDescription(_t('SilverStripe\\Forms\\GridField\\GridFieldDeleteAction.DELETE_DESCRIPTION', 'Delete'));
         }
         return $field->Field();
     }
@@ -169,7 +169,7 @@ class GridFieldDeleteAction implements GridField_ColumnProvider, GridField_Actio
             if ($actionName == 'deleterecord') {
                 if (!$item->canDelete()) {
                     throw new ValidationException(
-                        _t('GridFieldAction_Delete.DeletePermissionsFailure', "No delete permissions")
+                        _t('SilverStripe\\Forms\\GridField\\GridFieldDeleteAction.DeletePermissionsFailure', "No delete permissions")
                     );
                 }
 
@@ -177,7 +177,7 @@ class GridFieldDeleteAction implements GridField_ColumnProvider, GridField_Actio
             } else {
                 if (!$item->canEdit()) {
                     throw new ValidationException(
-                        _t('GridFieldAction_Delete.EditPermissionsFailure', "No permission to unlink record")
+                        _t('SilverStripe\\Forms\\GridField\\GridFieldDeleteAction.EditPermissionsFailure', "No permission to unlink record")
                     );
                 }
 
diff --git a/src/Forms/GridField/GridFieldExportButton.php b/src/Forms/GridField/GridFieldExportButton.php
index 49ccc3b64..0ed77ae07 100644
--- a/src/Forms/GridField/GridFieldExportButton.php
+++ b/src/Forms/GridField/GridFieldExportButton.php
@@ -59,7 +59,7 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
         $button = new GridField_FormAction(
             $gridField,
             'export',
-            _t('TableListField.CSVEXPORT', 'Export to CSV'),
+            _t('SilverStripe\\Forms\\GridField\\GridField.CSVEXPORT', 'Export to CSV'),
             'export',
             null
         );
diff --git a/src/Forms/GridField/GridFieldImportButton.php b/src/Forms/GridField/GridFieldImportButton.php
index 2f089e37a..ede46c37e 100644
--- a/src/Forms/GridField/GridFieldImportButton.php
+++ b/src/Forms/GridField/GridFieldImportButton.php
@@ -72,7 +72,7 @@ class GridFieldImportButton implements GridField_HTMLProvider
         $button = new GridField_FormAction(
             $gridField,
             'import',
-            _t('TableListField.CSVIMPORT', 'Import CSV'),
+            _t('SilverStripe\\Forms\\GridField\\GridField.CSVIMPORT', 'Import CSV'),
             'import',
             null
         );
diff --git a/src/Forms/GridField/GridFieldPrintButton.php b/src/Forms/GridField/GridFieldPrintButton.php
index c37ffd527..40ae6c674 100644
--- a/src/Forms/GridField/GridFieldPrintButton.php
+++ b/src/Forms/GridField/GridFieldPrintButton.php
@@ -60,7 +60,7 @@ class GridFieldPrintButton implements GridField_HTMLProvider, GridField_ActionPr
         $button = new GridField_FormAction(
             $gridField,
             'print',
-            _t('TableListField.Print', 'Print'),
+            _t('SilverStripe\\Forms\\GridField\\GridField.Print', 'Print'),
             'print',
             null
         );
diff --git a/src/Forms/HTMLEditor/HTMLEditorField_File.php b/src/Forms/HTMLEditor/HTMLEditorField_File.php
index 82c998391..65fb7dbce 100644
--- a/src/Forms/HTMLEditor/HTMLEditorField_File.php
+++ b/src/Forms/HTMLEditor/HTMLEditorField_File.php
@@ -147,10 +147,10 @@ abstract class HTMLEditorField_File extends ViewableData
     protected function getDetailFields()
     {
         $fields = new FieldList(
-            ReadonlyField::create("FileType", _t('AssetTableField.TYPE', 'File type'), $this->getFileType()),
+            ReadonlyField::create("FileType", _t('SilverStripe\\AssetAdmin\\Controller\\AssetAdmin.TYPE', 'File type'), $this->getFileType()),
             HTMLReadonlyField::create(
                 'ClickableURL',
-                _t('AssetTableField.URL', 'URL'),
+                _t('SilverStripe\\AssetAdmin\\Controller\\AssetAdmin.URL', 'URL'),
                 $this->getExternalLink()
             )
         );
@@ -158,19 +158,19 @@ abstract class HTMLEditorField_File extends ViewableData
         if ($this->getSize()) {
             $fields->insertAfter(
                 'FileType',
-                ReadonlyField::create("Size", _t('AssetTableField.SIZE', 'File size'), $this->getSize())
+                ReadonlyField::create("Size", _t('SilverStripe\\AssetAdmin\\Controller\\AssetAdmin.SIZE', 'File size'), $this->getSize())
             );
         }
         // Get modified details of local record
         if ($this->getFile()) {
             $fields->push(new DateField_Disabled(
                 "Created",
-                _t('AssetTableField.CREATED', 'First uploaded'),
+                _t('SilverStripe\\AssetAdmin\\Controller\\AssetAdmin.CREATED', 'First uploaded'),
                 $this->getFile()->Created
             ));
             $fields->push(new DateField_Disabled(
                 "LastEdited",
-                _t('AssetTableField.LASTEDIT', 'Last changed'),
+                _t('SilverStripe\\AssetAdmin\\Controller\\AssetAdmin.LASTEDIT', 'Last changed'),
                 $this->getFile()->LastEdited
             ));
         }
diff --git a/src/Forms/HTMLEditor/HTMLEditorField_Image.php b/src/Forms/HTMLEditor/HTMLEditorField_Image.php
index 5e03d4aeb..5f01c49bb 100644
--- a/src/Forms/HTMLEditor/HTMLEditorField_Image.php
+++ b/src/Forms/HTMLEditor/HTMLEditorField_Image.php
@@ -94,7 +94,7 @@ class HTMLEditorField_Image extends HTMLEditorField_File
                 'ClickableURL',
                 ReadonlyField::create(
                     "OriginalWidth",
-                    _t('AssetTableField.WIDTH', 'Width'),
+                    _t('SilverStripe\\AssetAdmin\\Controller\\AssetAdmin.WIDTH', 'Width'),
                     $width
                 )
             );
@@ -102,7 +102,7 @@ class HTMLEditorField_Image extends HTMLEditorField_File
                 'OriginalWidth',
                 ReadonlyField::create(
                     "OriginalHeight",
-                    _t('AssetTableField.HEIGHT', 'Height'),
+                    _t('SilverStripe\\AssetAdmin\\Controller\\AssetAdmin.HEIGHT', 'Height'),
                     $height
                 )
             );
diff --git a/src/ORM/FieldType/DBBoolean.php b/src/ORM/FieldType/DBBoolean.php
index 1cf20ea74..4d74fa24e 100644
--- a/src/ORM/FieldType/DBBoolean.php
+++ b/src/ORM/FieldType/DBBoolean.php
@@ -35,7 +35,7 @@ class DBBoolean extends DBField
 
     public function Nice()
     {
-        return ($this->value) ? _t('Boolean.YESANSWER', 'Yes') : _t('Boolean.NOANSWER', 'No');
+        return ($this->value) ? _t('SilverStripe\\ORM\\FieldType\\DBBoolean.YESANSWER', 'Yes') : _t('SilverStripe\\ORM\\FieldType\\DBBoolean.NOANSWER', 'No');
     }
 
     public function NiceAsBoolean()
@@ -60,10 +60,10 @@ class DBBoolean extends DBField
 
     public function scaffoldSearchField($title = null)
     {
-        $anyText = _t('Boolean.ANY', 'Any');
+        $anyText = _t('SilverStripe\\ORM\\FieldType\\DBBoolean.ANY', 'Any');
         $source = array(
-            1 => _t('Boolean.YESANSWER', 'Yes'),
-            0 => _t('Boolean.NOANSWER', 'No')
+            1 => _t('SilverStripe\\ORM\\FieldType\\DBBoolean.YESANSWER', 'Yes'),
+            0 => _t('SilverStripe\\ORM\\FieldType\\DBBoolean.NOANSWER', 'No')
         );
 
         $field = new DropdownField($this->name, $title, $source);
diff --git a/src/ORM/FieldType/DBDate.php b/src/ORM/FieldType/DBDate.php
index 4eeb6a0a7..8107b7127 100644
--- a/src/ORM/FieldType/DBDate.php
+++ b/src/ORM/FieldType/DBDate.php
@@ -349,14 +349,14 @@ class DBDate extends DBField
         $now = DBDatetime::now()->getTimestamp();
         if ($timestamp <= $now) {
             return _t(
-                'Date.TIMEDIFFAGO',
+                'SilverStripe\\ORM\\FieldType\\DBDate.TIMEDIFFAGO',
                 "{difference} ago",
                 'Natural language time difference, e.g. 2 hours ago',
                 array('difference' => $this->TimeDiff($includeSeconds, $significance))
             );
         } else {
             return _t(
-                'Date.TIMEDIFFIN',
+                'SilverStripe\\ORM\\FieldType\\DBDate.TIMEDIFFIN',
                 "in {difference}",
                 'Natural language time difference, e.g. in 2 hours',
                 array('difference' => $this->TimeDiff($includeSeconds, $significance))
@@ -379,7 +379,7 @@ class DBDate extends DBField
         $time = $this->getTimestamp();
         $ago = abs($time - $now);
         if ($ago < 60 && !$includeSeconds) {
-            return _t('Date.LessThanMinuteAgo', 'less than a minute');
+            return _t('SilverStripe\\ORM\\FieldType\\DBDate.LessThanMinuteAgo', 'less than a minute');
         } elseif ($ago < $significance * 60 && $includeSeconds) {
             return $this->TimeDiffIn('seconds');
         } elseif ($ago < $significance * 3600) {
diff --git a/src/ORM/FieldType/DBEnum.php b/src/ORM/FieldType/DBEnum.php
index 6c0e83ef5..59f85fc42 100644
--- a/src/ORM/FieldType/DBEnum.php
+++ b/src/ORM/FieldType/DBEnum.php
@@ -142,7 +142,7 @@ class DBEnum extends DBString
      */
     public function scaffoldSearchField($title = null)
     {
-        $anyText = _t('Enum.ANY', 'Any');
+        $anyText = _t('SilverStripe\\ORM\\FieldType\\DBEnum.ANY', 'Any');
         return $this->formField($title, null, true, $anyText, "($anyText)");
     }
 
diff --git a/src/Security/PermissionCheckboxSetField.php b/src/Security/PermissionCheckboxSetField.php
index dde6ed9cb..0303f34d7 100644
--- a/src/Security/PermissionCheckboxSetField.php
+++ b/src/Security/PermissionCheckboxSetField.php
@@ -267,7 +267,7 @@ class PermissionCheckboxSetField extends FormField
                 "<ul id=\"{$this->ID()}\" class=\"optionset checkboxsetfield{$this->extraClass()}\">\n" .
                 "<li class=\"help\">" .
                 _t(
-                    'Permissions.UserPermissionsIntro',
+                    'SilverStripe\\Security\\Permission.UserPermissionsIntro',
                     'Assigning groups to this user will adjust the permissions they have.'
                     . ' See the groups section for details of permissions on individual groups.'
                 ) .
diff --git a/tests/php/Forms/EnumFieldTest.php b/tests/php/Forms/EnumFieldTest.php
index 10c20131f..a92436159 100644
--- a/tests/php/Forms/EnumFieldTest.php
+++ b/tests/php/Forms/EnumFieldTest.php
@@ -17,7 +17,7 @@ class EnumFieldTest extends SapphireTest
 
         $searchField = $enumField->scaffoldSearchField();
 
-        $anyText = "(" . _t('Enum.ANY', 'Any') . ")";
+        $anyText = "(" . _t('SilverStripe\\ORM\\FieldType\\DBEnum.ANY', 'Any') . ")";
         $this->assertEquals(true, $searchField->getHasEmptyDefault());
         $this->assertEquals($anyText, $searchField->getEmptyString());
     }