diff --git a/javascript/lang/ar.js b/javascript/lang/ar.js
index fbaa83c..2cd5a24 100644
--- a/javascript/lang/ar.js
+++ b/javascript/lang/ar.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/ar.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/ar.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/ar_SA.js b/javascript/lang/ar_SA.js
index 67dfc57..dc3fc80 100644
--- a/javascript/lang/ar_SA.js
+++ b/javascript/lang/ar_SA.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/ar_SA.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/ar_SA.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/bg_BG.js b/javascript/lang/bg_BG.js
index 7b1efd0..9ccf4e3 100644
--- a/javascript/lang/bg_BG.js
+++ b/javascript/lang/bg_BG.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/bg_BG.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/bg_BG.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/da_DK.js b/javascript/lang/da_DK.js
index 792faa1..fbbb304 100644
--- a/javascript/lang/da_DK.js
+++ b/javascript/lang/da_DK.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/da_DK.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/da_DK.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/de_DE.js b/javascript/lang/de_DE.js
index 1af4a1d..dd0213a 100644
--- a/javascript/lang/de_DE.js
+++ b/javascript/lang/de_DE.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/de_DE.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/de_DE.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/en.js b/javascript/lang/en.js
index c2ebfa1..41915ee 100644
--- a/javascript/lang/en.js
+++ b/javascript/lang/en.js
@@ -1,21 +1,20 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/en.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/en.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
 	ss.i18n.addDictionary('en', {
-	"UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
-	"UserForms.ERROR_CREATING_FIELD": "Error creating field",
-	"UserForms.ADDING_FIELD": "Adding new field",
-	"UserForms.ADDED_FIELD": "Added new field",
-	"UserForms.HIDE_OPTIONS": "Hide options",
-	"UserForms.SHOW_OPTIONS": "Show options",
-	"UserForms.ADDING_OPTION": "Adding option",
-	"UserForms.ADDED_OPTION": "Added option",
-	"UserForms.ERROR_CREATING_OPTION": "Error creating option",
-	"UserForms.REMOVED_OPTION": "Removed option",
-	"UserForms.ADDING_RULE": "Adding rule",
-	"UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
-	"GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later."
+    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CREATING_FIELD": "Error creating field",
+    "UserForms.ADDING_FIELD": "Adding new field",
+    "UserForms.ADDED_FIELD": "Added new field",
+    "UserForms.HIDE_OPTIONS": "Hide options",
+    "UserForms.SHOW_OPTIONS": "Show options",
+    "UserForms.ADDING_OPTION": "Adding option",
+    "UserForms.ADDED_OPTION": "Added option",
+    "UserForms.ERROR_CREATING_OPTION": "Error creating option",
+    "UserForms.REMOVED_OPTION": "Removed option",
+    "UserForms.ADDING_RULE": "Adding rule",
+    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later."
 });
 }
\ No newline at end of file
diff --git a/javascript/lang/en_GB.js b/javascript/lang/en_GB.js
index c038d74..d9529d3 100644
--- a/javascript/lang/en_GB.js
+++ b/javascript/lang/en_GB.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/en_GB.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/en_GB.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js
index 6f5259c..657772b 100644
--- a/javascript/lang/en_US.js
+++ b/javascript/lang/en_US.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/en_US.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/en_US.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/eo.js b/javascript/lang/eo.js
index 2903712..51e5f7e 100644
--- a/javascript/lang/eo.js
+++ b/javascript/lang/eo.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/eo.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/eo.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/es_ES.js b/javascript/lang/es_ES.js
index b5dea91..defd12a 100644
--- a/javascript/lang/es_ES.js
+++ b/javascript/lang/es_ES.js
@@ -1,20 +1,20 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/es_ES.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/es_ES.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
 	ss.i18n.addDictionary('es_ES', {
-    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
-    "UserForms.ERROR_CREATING_FIELD": "Error creating field",
-    "UserForms.ADDING_FIELD": "Adding new field",
-    "UserForms.ADDED_FIELD": "Added new field",
-    "UserForms.HIDE_OPTIONS": "Hide options",
-    "UserForms.SHOW_OPTIONS": "Show options",
-    "UserForms.ADDING_OPTION": "Adding option",
-    "UserForms.ADDED_OPTION": "Added option",
-    "UserForms.ERROR_CREATING_OPTION": "Error creating option",
-    "UserForms.REMOVED_OPTION": "Removed option",
-    "UserForms.ADDING_RULE": "Adding rule",
-    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later."
+    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Se eliminarán todos los envíos. ¿Continuar?",
+    "UserForms.ERROR_CREATING_FIELD": "Error al crear campo",
+    "UserForms.ADDING_FIELD": "Agregar un nuevo campo",
+    "UserForms.ADDED_FIELD": "Nuevo campo agregado",
+    "UserForms.HIDE_OPTIONS": "Ocultar opciones",
+    "UserForms.SHOW_OPTIONS": "Mostrar opciones",
+    "UserForms.ADDING_OPTION": "Agregar opción",
+    "UserForms.ADDED_OPTION": "Opción agregada",
+    "UserForms.ERROR_CREATING_OPTION": "Error al crear opción",
+    "UserForms.REMOVED_OPTION": "Opción eliminada",
+    "UserForms.ADDING_RULE": "Agregar regla",
+    "GRIDFIELD.ERRORINTRANSACTION": "Ocurrió un error mientras se obtenían datos desde el servidor\n Por favor, más tarde, inténtelo nuevamente."
 });
 }
\ No newline at end of file
diff --git a/javascript/lang/es_MX.js b/javascript/lang/es_MX.js
index e311535..0571dd4 100644
--- a/javascript/lang/es_MX.js
+++ b/javascript/lang/es_MX.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/es_MX.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/es_MX.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/et_EE.js b/javascript/lang/et_EE.js
index c66002c..38fa8d7 100644
--- a/javascript/lang/et_EE.js
+++ b/javascript/lang/et_EE.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/et_EE.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/et_EE.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/fi_FI.js b/javascript/lang/fi_FI.js
index 875a1cb..9ebd452 100644
--- a/javascript/lang/fi_FI.js
+++ b/javascript/lang/fi_FI.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/fi_FI.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/fi_FI.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/fr_FR.js b/javascript/lang/fr_FR.js
index eff1b09..930ad34 100644
--- a/javascript/lang/fr_FR.js
+++ b/javascript/lang/fr_FR.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/fr_FR.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/fr_FR.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/hr_HR.js b/javascript/lang/hr_HR.js
index 3411167..55c94fd 100644
--- a/javascript/lang/hr_HR.js
+++ b/javascript/lang/hr_HR.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/hr_HR.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/hr_HR.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/id.js b/javascript/lang/id.js
index 4db0f6a..4f49ee6 100644
--- a/javascript/lang/id.js
+++ b/javascript/lang/id.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/id.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/id.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/ja.js b/javascript/lang/ja.js
index b0ece93..91faf85 100644
--- a/javascript/lang/ja.js
+++ b/javascript/lang/ja.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/ja.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/ja.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/mi.js b/javascript/lang/mi.js
index b2cf860..19c87cf 100644
--- a/javascript/lang/mi.js
+++ b/javascript/lang/mi.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/mi.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/mi.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/ms_MY.js b/javascript/lang/ms_MY.js
index eb7fb70..9eee39b 100644
--- a/javascript/lang/ms_MY.js
+++ b/javascript/lang/ms_MY.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/ms_MY.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/ms_MY.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/nb_NO.js b/javascript/lang/nb_NO.js
index 09bbbfb..294f5ba 100644
--- a/javascript/lang/nb_NO.js
+++ b/javascript/lang/nb_NO.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/nb_NO.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/nb_NO.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/nl_NL.js b/javascript/lang/nl_NL.js
index d509247..58de5b7 100644
--- a/javascript/lang/nl_NL.js
+++ b/javascript/lang/nl_NL.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/nl_NL.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/nl_NL.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/pl_PL.js b/javascript/lang/pl_PL.js
index 0b3ba06..c50333b 100644
--- a/javascript/lang/pl_PL.js
+++ b/javascript/lang/pl_PL.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/pl_PL.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/pl_PL.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/pt_PT.js b/javascript/lang/pt_PT.js
index 7d348a8..ca1d66e 100644
--- a/javascript/lang/pt_PT.js
+++ b/javascript/lang/pt_PT.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/pt_PT.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/pt_PT.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/ru_RU.js b/javascript/lang/ru_RU.js
index 8d23646..8733f70 100644
--- a/javascript/lang/ru_RU.js
+++ b/javascript/lang/ru_RU.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/ru_RU.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/ru_RU.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/sr_RS.js b/javascript/lang/sr_RS.js
index bcb5c16..bb216b4 100644
--- a/javascript/lang/sr_RS.js
+++ b/javascript/lang/sr_RS.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/sr_RS.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/sr_RS.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/src/en.js b/javascript/lang/src/en.js
index 4e2b6bb..3990fbd 100644
--- a/javascript/lang/src/en.js
+++ b/javascript/lang/src/en.js
@@ -1,15 +1,14 @@
 {
-	"UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
-	"UserForms.ERROR_CREATING_FIELD": "Error creating field",
-	"UserForms.ADDING_FIELD": "Adding new field",
-	"UserForms.ADDED_FIELD": "Added new field",
-	"UserForms.HIDE_OPTIONS": "Hide options",
-	"UserForms.SHOW_OPTIONS": "Show options",
-	"UserForms.ADDING_OPTION": "Adding option",
-	"UserForms.ADDED_OPTION": "Added option",
-	"UserForms.ERROR_CREATING_OPTION": "Error creating option",
-	"UserForms.REMOVED_OPTION": "Removed option",
-	"UserForms.ADDING_RULE": "Adding rule",
-	"UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
-	"GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later."
+    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CREATING_FIELD": "Error creating field",
+    "UserForms.ADDING_FIELD": "Adding new field",
+    "UserForms.ADDED_FIELD": "Added new field",
+    "UserForms.HIDE_OPTIONS": "Hide options",
+    "UserForms.SHOW_OPTIONS": "Show options",
+    "UserForms.ADDING_OPTION": "Adding option",
+    "UserForms.ADDED_OPTION": "Added option",
+    "UserForms.ERROR_CREATING_OPTION": "Error creating option",
+    "UserForms.REMOVED_OPTION": "Removed option",
+    "UserForms.ADDING_RULE": "Adding rule",
+    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later."
 }
\ No newline at end of file
diff --git a/javascript/lang/src/es_ES.js b/javascript/lang/src/es_ES.js
index 3990fbd..6e47b7f 100644
--- a/javascript/lang/src/es_ES.js
+++ b/javascript/lang/src/es_ES.js
@@ -1,14 +1,14 @@
 {
-    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
-    "UserForms.ERROR_CREATING_FIELD": "Error creating field",
-    "UserForms.ADDING_FIELD": "Adding new field",
-    "UserForms.ADDED_FIELD": "Added new field",
-    "UserForms.HIDE_OPTIONS": "Hide options",
-    "UserForms.SHOW_OPTIONS": "Show options",
-    "UserForms.ADDING_OPTION": "Adding option",
-    "UserForms.ADDED_OPTION": "Added option",
-    "UserForms.ERROR_CREATING_OPTION": "Error creating option",
-    "UserForms.REMOVED_OPTION": "Removed option",
-    "UserForms.ADDING_RULE": "Adding rule",
-    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later."
+    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Se eliminarán todos los envíos. ¿Continuar?",
+    "UserForms.ERROR_CREATING_FIELD": "Error al crear campo",
+    "UserForms.ADDING_FIELD": "Agregar un nuevo campo",
+    "UserForms.ADDED_FIELD": "Nuevo campo agregado",
+    "UserForms.HIDE_OPTIONS": "Ocultar opciones",
+    "UserForms.SHOW_OPTIONS": "Mostrar opciones",
+    "UserForms.ADDING_OPTION": "Agregar opción",
+    "UserForms.ADDED_OPTION": "Opción agregada",
+    "UserForms.ERROR_CREATING_OPTION": "Error al crear opción",
+    "UserForms.REMOVED_OPTION": "Opción eliminada",
+    "UserForms.ADDING_RULE": "Agregar regla",
+    "GRIDFIELD.ERRORINTRANSACTION": "Ocurrió un error mientras se obtenían datos desde el servidor\n Por favor, más tarde, inténtelo nuevamente."
 }
\ No newline at end of file
diff --git a/javascript/lang/sv.js b/javascript/lang/sv.js
index 9c59bbc..5da309d 100644
--- a/javascript/lang/sv.js
+++ b/javascript/lang/sv.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/sv.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/sv.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/tr_TR.js b/javascript/lang/tr_TR.js
index fab08c0..ef9f5ce 100644
--- a/javascript/lang/tr_TR.js
+++ b/javascript/lang/tr_TR.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/tr_TR.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/tr_TR.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/javascript/lang/zh.js b/javascript/lang/zh.js
index 5b7edb8..2aadf8a 100644
--- a/javascript/lang/zh.js
+++ b/javascript/lang/zh.js
@@ -1,5 +1,5 @@
-// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/zh.js.
-// See https://github.com/silverstripe/silverstripe-buildtools for details
+// This file was generated by silverstripe/cow from javascript/lang/src/zh.js.
+// See https://github.com/tractorcow/cow for details
 if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
diff --git a/lang/ar.yml b/lang/ar.yml
index c7308cf..eeba7a6 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -138,7 +138,6 @@ ar:
     ONCOMPLETELABEL: 'اعرض عند الاكتمال'
     ORSELECTAFIELDTOUSEASFROM: '.. أو تحديد حقل لاستخدامه كعنوان للرد'
     ORSELECTAFIELDTOUSEASTO: '.. أو تحديد حقل لاستخدامه على أنه عنوان المرسل إليه'
-    PLURALNAME: 'الصفحات الأساسية'
     REPLYADDRESS: 'بريد إلكتروني للرد علي'
     SAVESUBMISSIONS: 'قم بتعطيل حفظ التقديمات إلى الخادم'
     SENDEMAILTO: 'ارسل بريد إلكتروني إلى'
diff --git a/lang/de_DE.yml b/lang/de_DE.yml
index 3d7e3ec..58b7615 100644
--- a/lang/de_DE.yml
+++ b/lang/de_DE.yml
@@ -145,7 +145,6 @@ de_DE:
     ONCOMPLETELABEL: 'Nach Vervollständigung anzeigen'
     ORSELECTAFIELDTOUSEASFROM: '.. oder wähle ein Formularfeld als Absenderadresse'
     ORSELECTAFIELDTOUSEASTO: '.. oder wähle ein Formularfeld als Empfängeradresse'
-    PLURALNAME: 'Anpassbare Formulare'
     REPLYADDRESS: 'E-Mail Adresse für "Antworten an"'
     SAVESUBMISSIONS: 'Speichern von Einreichungen deaktivieren'
     SENDEMAILTO: 'E-Mail senden an'
diff --git a/lang/en.yml b/lang/en.yml
index 3b5a450..b249585 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -22,6 +22,9 @@ en:
   EditableCountryDropdownField:
     PLURALNAME: 'Country Dropdowns'
     SINGULARNAME: 'Country Dropdown'
+  EditableCustomRule:
+    PLURALNAME: 'Editable Custom Rules'
+    SINGULARNAME: 'Editable Custom Rule'
   EditableDateField:
     PLURALNAME: 'Date Fields'
     SINGULARNAME: 'Date Field'
@@ -31,6 +34,14 @@ en:
   EditableEmailField:
     PLURALNAME: 'Email Fields'
     SINGULARNAME: 'Email Field'
+  EditableFieldGroup:
+    PLURALNAME: 'Editable Field Groups'
+    SINGULARNAME: 'Editable Field Group'
+  EditableFieldGroupEnd:
+    FIELD_GROUP_END: '{group} end'
+    FIELD_GROUP_START: 'Group {group}'
+    PLURALNAME: 'Editable Field Group Ends'
+    SINGULARNAME: 'Editable Field Group End'
   EditableFileField:
     PLURALNAME: 'File Upload Fields'
     SINGULARNAME: 'File Upload Field'
@@ -41,13 +52,19 @@ en:
     BLANK: Blank
     CHECKEDBYDEFAULT: 'Checked by Default?'
     CUSTOMERROR: 'Custom Error Message'
+    CUSTOMOPTIONS: Options
     CUSTOMRULES: 'Custom Rules'
+    DEFAULT: 'Default value'
     DEFAULTTOTODAY: 'Default to Today?'
     DELETE: Delete
     DRAG: 'Drag to rearrange order of fields'
     ENTERQUESTION: 'Enter Question'
     EXTRACLASSA: 'Extra Styling/Layout'
     EXTRACLASSB: 'Extra css Class - separate multiples with a space'
+    EXTRACLASS_MULTIPLE: 'Separate each CSS class with a single space'
+    EXTRACLASS_SELECT: 'Select from the list of allowed styles'
+    EXTRACLASS_TITLE: 'Extra Styling/Layout'
+    EXTRACLASS_Title: 'Extra CSS Classes'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
     GREATERTHAN: 'Value Greater Than'
@@ -67,20 +84,32 @@ en:
     OPTIONS: Options
     PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Is this field Required?'
-    RIGHTTITLE: 'Right Title'
+    REQUIRED_DESCRIPTION: 'Please note that conditional fields can''t be required'
+    RIGHTTITLE: 'Right title'
     SHOW: Show
+    SHOWONLOAD: 'Initial visibility before processing these rules'
     SHOWOPTIONS: 'Show Options'
     SHOWTHISFIELD: 'Show This Field'
     SINGULARNAME: 'Editable Form Field'
+    TITLE: Title
+    TYPE: Type
     VALIDATION: Validation
     VALUE: Value
     WHEN: When
     'YES': 'Yes'
+  EditableFormFieldValidator:
+    REQUIRED_ERROR: 'Form fields cannot be required and have conditional display rules.'
   EditableFormHeading:
     LEVEL: 'Select Heading Level'
     PLURALNAME: Headings
     SINGULARNAME: Heading
+  EditableFormStep:
+    PLURALNAME: 'Page Breaks'
+    SINGULARNAME: 'Page Break'
+    STEP_TITLE: 'Page {page}'
+    TITLE_FIRST: 'First Page'
   EditableLiteralField:
+    CONTENT: HTML
     HIDEFROMREPORT: 'Hide from reports?'
     PLURALNAME: 'HTML Blocks'
     SINGULARNAME: 'HTML Block'
@@ -88,10 +117,13 @@ en:
     PLURALNAME: 'Member List Fields'
     SINGULARNAME: 'Member List Field'
   EditableMultipleOptionField:
+    DEFAULT: 'Selected by default?'
     PLURALNAME: 'Editable Multiple Option Fields'
     SINGULARNAME: 'Editable Multiple Option Field'
   EditableNumericField:
     PLURALNAME: 'Numeric Fields'
+    RANGE: 'Allowed numeric range'
+    RANGE_TO: to
     SINGULARNAME: 'Numeric Field'
   EditableOption:
     DELETE: 'Remove this option'
@@ -104,9 +136,11 @@ en:
     SINGULARNAME: 'Radio Group'
   EditableTextField:
     NUMBERROWS: 'Number of rows'
+    NUMBERROWS_DESCRIPTION: 'Fields with more than one row will be generated as a textarea'
     PLURALNAME: 'Text Fields'
+    RANGE_TO: to
     SINGULARNAME: 'Text Field'
-    TEXTLENGTH: 'Text length'
+    TEXTLENGTH: 'Allowed text length'
   EditableUploadField:
     SELECTUPLOADFOLDER: 'Select upload folder'
   FieldEditor:
@@ -137,13 +171,17 @@ en:
     DESCRIPTION: 'Adds a customizable form.'
     DISABLEAUTHENICATEDFINISHACTION: 'Disable Authenication on finish action'
     DISABLECSRFSECURITYTOKEN: 'Disable CSRF Token'
+    DISPLAYERRORMESSAGESATTOP: 'Display error messages above the form?'
     EMAILADDRESS: Email
     EMAILBODY: Body
+    EMAILBODYHTML: Body
     EMAILFROM: From
     EMAILRECIPIENTS: 'Email Recipients'
     EMAILSUBJECT: 'Email subject'
+    EMAILTEMPLATE: 'Email template'
     ENABLELIVEVALIDATION: 'Enable live validation'
     EmailFromContent: 'The from address allows you to set who the email comes from. On most servers this will need to be set to an email address on the same domain name as your site. For example on yoursite.com the from address may need to be something@yoursite.com. You can however, set any email address you wish as the reply to address.'
+    FIELDS: Fields
     FORM: Form
     FROMADDRESS: 'Send email from'
     HIDEFIELDLABELS: 'Hide field labels'
@@ -152,10 +190,18 @@ en:
     ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
     ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'Base Pages'
+    PREVIEW_EMAIL: 'Preview email'
+    PREVIEW_EMAIL_DESCRIPTION: 'Note: Unsaved changes will not appear in the preview.'
+    PREVIEW_EMAIL_UNAVAILABLE: 'You can preview this email once you have saved the Recipient.'
+    RECIPIENTS: Recipients
     REPLYADDRESS: 'Email for reply to'
+    REPLYADDRESS_DESCRIPTION: 'The email address which the recipient is able to ''reply'' to.'
+    RulesDescription: 'Emails will only be sent to the recipient if the custom rules are met. If no rules are defined, this receipient will receive notifications for every submission.'
     SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SELECTAFIELDTOSETSUBJECT: '.. or select a field to use as the subject'
     SENDEMAILTO: 'Send email to'
+    SENDEMAILTO_DESCRIPTION: 'You may enter multiple email addresses as a comma separated list.'
+    SENDIF: 'Send condition'
     SENDPLAIN: 'Send email as plain text? (HTML will be stripped)'
     SHOWCLEARFORM: 'Show Clear Form Button'
     SINGULARNAME: 'User Defined Form'
@@ -163,9 +209,26 @@ en:
     SUBMITBUTTON: Submit
     TEXTONCLEAR: 'Text on clear button:'
     TEXTONSUBMIT: 'Text on submit button:'
+    TYPEREPLY: 'Type reply address'
+    TYPESUBJECT: 'Type subject'
+    TYPETO: 'Type to address'
   UserDefinedForm_EmailRecipient:
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
+  UserDefinedForm_EmailRecipientCondition:
+    PLURALNAME: 'User Defined Form Email Recipient Conditions'
+    SINGULARNAME: 'User Defined Form Email Recipient Condition'
+  UserFormFieldEditorExtension:
+    ADD_FIELD: 'Add Field'
+    ADD_FIELD_GROUP: 'Add Field Group'
+    ADD_PAGE_BREAK: 'Add Page Break'
+    FORMFIELDS: 'Form Fields'
+  UserFormValidator:
+    CONDITIONAL_REQUIRED: 'Required field ''{name}'' cannot be placed within a conditional page'
+    NO_PAGE: 'Field ''{name}'' found before any pages'
+    UNEXPECTED_BREAK: 'Unexpected page break ''{name}'' inside nested field ''{group}'''
+    UNEXPECTED_GROUP_END: '''{name}'' found without a matching group'
+    WRONG_GROUP_END: '''{name}'' found closes the wrong group ''{group}'''
   UserFormsGridFieldFilterHeader:
     FILTERSUBMISSIONS: 'Filter Submissions..'
     WHEREVALUEIS: 'where value is..'
diff --git a/lang/eo.yml b/lang/eo.yml
index bc78f4c..55e96c6 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -149,7 +149,6 @@ eo:
     ONCOMPLETELABEL: 'Vidigi je kompletigo'
     ORSELECTAFIELDTOUSEASFROM: '.. aŭ elekti kampon uzotan kiel respondi-al-adreson'
     ORSELECTAFIELDTOUSEASTO: '.. aŭ elekti kampon uzotan kiel la al-adreson'
-    PLURALNAME: 'Propre difinitaj formularoj'
     REPLYADDRESS: 'Retpoŝto al kiu respondi'
     SAVESUBMISSIONS: 'Malŝalti konservi sendaĵojn al servilo'
     SELECTAFIELDTOSETSUBJECT: '.. aŭ elekti kampon uzotan kiel la temon'
diff --git a/lang/es_ES.yml b/lang/es_ES.yml
index b59329e..60ff347 100644
--- a/lang/es_ES.yml
+++ b/lang/es_ES.yml
@@ -13,39 +13,71 @@ es_ES:
     SHOWTHISFIELD: 'Mostrar este campo'
     VALUE: Valor
     WHEN: Cuando
+  EditableCheckbox:
+    PLURALNAME: Casillas de verificación
+    SINGULARNAME: 'Campo de casillas de verificación'
+  EditableCheckboxGroupField:
+    PLURALNAME: 'Grupos de casillas de verificación'
+    SINGULARNAME: 'Grupo de casillas de verificación'
   EditableCountryDropdownField:
     PLURALNAME: 'Selector de países'
     SINGULARNAME: 'Selector de país'
+  EditableDateField:
+    PLURALNAME: 'Campos de fecha'
+    SINGULARNAME: 'Campo de fecha'
+  EditableDropdown:
+    PLURALNAME: Listas desplegables
   EditableEmailField:
     PLURALNAME: 'Correos electrónicos'
     SINGULARNAME: 'Campo de correo electrónico'
+  EditableFileField:
+    PLURALNAME: 'Campos subir archivo'
+    SINGULARNAME: 'Campo subir archivo'
   EditableFormField:
     ADD: Agregar
+    ADDLabel: 'Agregar opción'
     ADDRULE: 'Agregar regla'
     BLANK: blanco
+    CHECKEDBYDEFAULT: '¿Marcado por defecto?'
+    CUSTOMERROR: 'Mensaje de error personalizado'
     CUSTOMRULES: 'Reglas especiales'
+    DEFAULTTOTODAY: '¿Por defecto a hoy?'
     DELETE: Borrar este campo
     DRAG: 'Arrastre para reajustar el orden de los campos'
+    ENTERQUESTION: 'Ingresar pregunta'
+    EXTRACLASSA: 'Estilo/disposición adicional'
+    EXTRACLASSB: 'Clase CSS adicional - separar varias con un espacio'
     FIELDCONFIGURATION: 'Configuración del campo'
     FIELDONDEFAULT: 'Campo por defecto'
     GREATERTHAN: 'Valor más grande que'
     GREATERTHANEQUAL: 'Valor más grande o igual que'
+    GROUP: Grupo
     HIDE: Esconder
     HIDETHISFIELD: 'Esconder este campo'
     IS: Es
     LESSTHAN: 'Valor menor que'
     LESSTHANEQUAL: 'Valor menor o igual que'
     LOCKED: 'Estos campos no pueden ser modificados'
+    MAXVALUE: 'Valor máximo'
+    MINVALUE: 'Valor mínimo'
+    'NO': 'No'
     NOTBLANK: 'No puede ser en blanco'
     NOTVALUE: 'Sin valor'
     OPTIONS: Opciones
+    PLURALNAME: 'Campos de formulario editables'
     REQUIRED: 'Este campo es necesario para este formulario y no puede ser borrado'
     SHOW: Mostrar
     SHOWOPTIONS: 'Mostrar opciones'
     SHOWTHISFIELD: 'Mostrar este campo'
+    SINGULARNAME: 'Campo de formulario editable'
     VALIDATION: Validación
     VALUE: Valor
     WHEN: Cuando
+    'YES': 'Sí'
+  EditableFormHeading:
+    LEVEL: 'Selecionar el nivel del encabezado'
+    PLURALNAME: Encabezados
+    SINGULARNAME: Encabezado
   EditableLiteralField:
     HIDEFROMREPORT: '¿Ocultar de los informes?'
     PLURALNAME: 'Bloques HTML'
@@ -56,12 +88,33 @@ es_ES:
   EditableMultipleOptionField:
     PLURALNAME: 'Campos de opción múltiple'
     SINGULARNAME: 'Campo de opción múltiple'
+  EditableNumericField:
+    PLURALNAME: 'Campos numéricos'
+    SINGULARNAME: 'Campo numérico'
   EditableOption:
     DELETE: 'Remover esta opción'
     DRAG: 'Arrastrar para reorganizar el orden de las opciones'
     LOCKED: 'Estos campos no pueden ser modificados'
+    PLURALNAME: 'Opciones editables'
+    SINGULARNAME: 'Opciones editables'
+  EditableTextField:
+    NUMBERROWS: 'Cantidad de filas'
+    PLURALNAME: 'Campos de texto'
+    SINGULARNAME: 'Campo de texto'
+    TEXTLENGTH: 'Longitud del texto'
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Seleccionar carpeta de carga'
+  FieldEditor:
+    ADD: Agregar
+    SELECTAFIELD: 'Seleccionar un campo'
   Form:
     FIELDISREQUIRED: '%s es requerido'
+  GridField:
+    Filter: Filtro
+    ResetFilter: Restablecer
+  SiteTree:
+    PLURALNAME: Páginas
+    SINGULARNAME: Página
   SubmittedFileField:
     DOWNLOADFILE: 'Descargar archivo'
     PLURALNAME: 'Archivos enviados'
@@ -73,18 +126,28 @@ es_ES:
     PLURALNAME: 'Campos enviados en formulario'
     SINGULARNAME: 'Campo enviado en formulario'
   UserDefinedForm:
+    ADDEMAILRECIPIENT: 'Agregar destinatario de email'
+    CONFIGURATION: Configuración
+    DESCRIPTION: 'Agrega un formulario personalizable.'
+    DISABLEAUTHENICATEDFINISHACTION: 'Deshabilitar la autenticación al terminar la acción'
     EMAILADDRESS: Email
     EMAILBODY: Cuerpo
     EMAILFROM: De
     EMAILRECIPIENTS: 'Destinatarios'
     EMAILSUBJECT: 'Asunto del correo'
+    ENABLELIVEVALIDATION: 'Habilitar la validación en vivo'
+    EmailFromContent: 'La dirección desde permite establecer de quien viene el email. En la mayoría de los servidores esto se necesitará establecer a una dirección de email del mismo nombre de dominio que su sitio. Por ejemplo, en susitio.com la dirección desde puede ser algo como loquesea@susitio.com. Sin embargo, Ud puede establecer cualquier dirección de email que desee como dirección del remitente.'
     FORM: Formulario
     FROMADDRESS: 'Enviar este mail desde'
+    HIDEFIELDLABELS: 'Ocultar rótulos de campo'
     HIDEFORMDATA: 'Esconder los datos enviados en el mail'
     ONCOMPLETELABEL: 'Mostrar al terminar'
     ORSELECTAFIELDTOUSEASFROM: '.. o seleccione un campo del formulario para utilizar como dirección del remitente'
     ORSELECTAFIELDTOUSEASTO: '.. o seleccione un campo que se utiliza como la dirección'
+    PLURALNAME: 'Páginas base'
+    REPLYADDRESS: 'Email para responder a'
     SAVESUBMISSIONS: 'Deshabilitar el guardado de emails en el servidor'
+    SELECTAFIELDTOSETSUBJECT: '... o seleccionar un campo para usarlo como el asunto'
     SENDEMAILTO: 'Enviar mail a'
     SENDPLAIN: 'Enviar el correo como texto plano'
     SHOWCLEARFORM: 'Mostrar el botón borrar'
@@ -95,3 +158,6 @@ es_ES:
   UserDefinedForm_EmailRecipient:
     PLURALNAME: 'Destinatarios definidos por el usuario'
     SINGULARNAME: 'Destinatario definido por el usuario'
+  UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Filtrar envíos.'
+    WHEREVALUEIS: 'donde el valor es'
diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml
index cd73055..ba669b9 100644
--- a/lang/fi_FI.yml
+++ b/lang/fi_FI.yml
@@ -145,7 +145,6 @@ fi_FI:
     ONCOMPLETELABEL: 'Näytä valmistuessa'
     ORSELECTAFIELDTOUSEASFROM: '.. tai valitse kenttä, jota käytetään Reply To -osoitteena'
     ORSELECTAFIELDTOUSEASTO: '.. tai valitse kenttä, jota käytetään vastaanottajan osoitteena'
-    PLURALNAME: 'Käyttäjän määrittelemät lomakkeet'
     REPLYADDRESS: 'Vastaussähköposti'
     SAVESUBMISSIONS: 'Poista lomakkeen tallennus tietokantaan (lähetys vain sähköpostiin)'
     SENDEMAILTO: 'Lähetä sähköposti osoitteeseen'
diff --git a/lang/mi.yml b/lang/mi.yml
index 418ea0e..d1438f6 100644
--- a/lang/mi.yml
+++ b/lang/mi.yml
@@ -138,7 +138,6 @@ mi:
     ONCOMPLETELABEL: 'Whakaaturia ina oti'
     ORSELECTAFIELDTOUSEASFROM: '.. ka tīpako rānei i tētahi āpure hei whakamahi hei wāhitau whakautu ki'
     ORSELECTAFIELDTOUSEASTO: '.. ka tīpako rānei i tētahi āpure hei whakamahi hei wāhitau ki'
-    PLURALNAME: 'Ngā Whārangi Taketake'
     REPLYADDRESS: 'Īmēra hei whakautu ki'
     SAVESUBMISSIONS: 'Monokia Ngā Tukunga Tiaki ki te Tūmau'
     SENDEMAILTO: 'Tuku īmēra ki'
diff --git a/lang/nb_NO.yml b/lang/nb_NO.yml
index dc70949..1c0e0e9 100644
--- a/lang/nb_NO.yml
+++ b/lang/nb_NO.yml
@@ -139,7 +139,6 @@ nb_NO:
     ONCOMPLETELABEL: 'Vis ved ferdigstillelse'
     ORSELECTAFIELDTOUSEASFROM: '...eller velg et felt til å bruke som "svar til"-adresse'
     ORSELECTAFIELDTOUSEASTO: '...eller velg et felt til å bruke som adresse'
-    PLURALNAME: 'Base sider'
     REPLYADDRESS: 'E-post som "reply to"'
     SAVESUBMISSIONS: 'Slå av auto lagring'
     SENDEMAILTO: 'Send e-post til'
diff --git a/lang/nl_NL.yml b/lang/nl_NL.yml
index 0c140fd..b34073d 100644
--- a/lang/nl_NL.yml
+++ b/lang/nl_NL.yml
@@ -145,7 +145,6 @@ nl_NL:
     ONCOMPLETELABEL: 'Bericht na succesvol verzonden'
     ORSELECTAFIELDTOUSEASFROM: '.. of selecteer een veld om te gebruiken als antwoorden op'
     ORSELECTAFIELDTOUSEASTO: '.. of selecteer een veld om te gebruiken als ontvanger'
-    PLURALNAME: 'Formulier pagina''s'
     REPLYADDRESS: 'E-mail voor antwoord op'
     SAVESUBMISSIONS: 'Schakel opslaan van inzendingen uit'
     SENDEMAILTO: 'Stuur email naar'
diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml
index 466bcc4..a6228d5 100644
--- a/lang/pl_PL.yml
+++ b/lang/pl_PL.yml
@@ -1,8 +1,8 @@
 pl_PL:
   CustomRule:
     BLANK: Blank
-    DELETE: Delete
-    GREATERTHAN: 'Value Greater Than'
+    DELETE: Usuń
+    GREATERTHAN: 'Wartość większa od'
     GREATERTHANEQUAL: 'Value Greater Than Or Equal'
     HIDETHISFIELD: 'Hide This Field'
     IS: Is
@@ -13,39 +13,73 @@ pl_PL:
     SHOWTHISFIELD: 'Show This Field'
     VALUE: Value
     WHEN: When
+  EditableCheckbox:
+    PLURALNAME: Checkboxes
+    SINGULARNAME: 'Checkbox Field'
+  EditableCheckboxGroupField:
+    PLURALNAME: 'Checkbox Groups'
+    SINGULARNAME: 'Checkbox Group'
   EditableCountryDropdownField:
     PLURALNAME: 'Country Dropdowns'
     SINGULARNAME: 'Country Dropdown'
+  EditableDateField:
+    PLURALNAME: 'Pola daty'
+    SINGULARNAME: 'Pole daty'
+  EditableDropdown:
+    PLURALNAME: Dropdowns
+    SINGULARNAME: 'Dropdown Field'
   EditableEmailField:
     PLURALNAME: 'Email Fields'
     SINGULARNAME: 'Email Field'
+  EditableFileField:
+    PLURALNAME: 'Pola przesyłania plików'
+    SINGULARNAME: 'Pole przesyłania pliku'
   EditableFormField:
     ADD: Add
+    ADDLabel: 'Dodaj opcję'
     ADDRULE: 'Add Rule'
     BLANK: Blank
+    CHECKEDBYDEFAULT: 'Zaznaczenie domyślne?'
+    CUSTOMERROR: 'Własny komunikat o błędzie'
     CUSTOMRULES: 'Custom Rules'
+    DEFAULTTOTODAY: 'Domyślnie to dzisiaj?'
     DELETE: Usuń to pole
     DRAG: 'Przeciągnij aby zmienić kolejność pól'
+    ENTERQUESTION: 'Wpisz pytanie'
+    EXTRACLASSA: 'Dodatkowy styl / layout'
+    EXTRACLASSB: 'Dodatkowa klasa css - gdy więcej to oddziel je spacjami'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
     GREATERTHAN: 'Value Greater Than'
     GREATERTHANEQUAL: 'Value Greater Than Or Equal'
+    GROUP: Grupa
     HIDE: Hide
     HIDETHISFIELD: 'Hide This Field'
     IS: Is
     LESSTHAN: 'Value Less Than'
     LESSTHANEQUAL: 'Value Less Than Or Equal'
     LOCKED: 'Te pola nie mogą być modyfikowane'
+    MAXVALUE: 'Wartość max'
+    MINVALUE: 'Wartość min'
+    'NO': 'Nie'
     NOTBLANK: 'Not Blank'
     NOTVALUE: 'Not Value'
     OPTIONS: Options
+    PLURALNAME: 'Edytowalne pole formularza'
     REQUIRED: 'To pole jest wymagane w tym formularzu i nie może zostać usunięte'
+    RIGHTTITLE: 'Right Title'
     SHOW: Show
     SHOWOPTIONS: 'Show Options'
     SHOWTHISFIELD: 'Show This Field'
+    SINGULARNAME: 'Edytowalne pole formularza'
     VALIDATION: Validation
     VALUE: Value
     WHEN: When
+    'YES': 'Tak'
+  EditableFormHeading:
+    LEVEL: 'Wybierzpoziom nagłówka'
+    PLURALNAME: Nagłówki
+    SINGULARNAME: Nagłówek
   EditableLiteralField:
     HIDEFROMREPORT: 'Hide from reports?'
     PLURALNAME: 'HTML Blocks'
@@ -56,12 +90,36 @@ pl_PL:
   EditableMultipleOptionField:
     PLURALNAME: 'Editable Multiple Option Fields'
     SINGULARNAME: 'Editable Multiple Option Field'
+  EditableNumericField:
+    PLURALNAME: 'Pola numeryczne'
+    SINGULARNAME: 'Pole numeryczne'
   EditableOption:
     DELETE: 'Remove this option'
     DRAG: 'Drag to rearrange order of options'
     LOCKED: 'These fields cannot be modified'
+    PLURALNAME: 'Edytowalne opcje'
+    SINGULARNAME: 'Edytowalna opcja'
+  EditableRadioField:
+    PLURALNAME: 'Pola wyboru'
+    SINGULARNAME: 'Pole wyboru'
+  EditableTextField:
+    NUMBERROWS: 'Liczba wierszy'
+    PLURALNAME: 'Pola tekstowe'
+    SINGULARNAME: 'Pole tekstowe'
+    TEXTLENGTH: 'Długość tekstu'
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Wybierz folder dla przesyłanych plików'
+  FieldEditor:
+    ADD: Dodaj
+    SELECTAFIELD: 'Wybierz pole'
   Form:
     FIELDISREQUIRED: '%s is required'
+  GridField:
+    Filter: Filter
+    ResetFilter: Resetuj
+  SiteTree:
+    PLURALNAME: Strony
+    SINGULARNAME: Strona
   SubmittedFileField:
     DOWNLOADFILE: 'Download File'
     PLURALNAME: 'Submitted File Fields'
@@ -73,26 +131,41 @@ pl_PL:
     PLURALNAME: 'Submitted Form Fields'
     SINGULARNAME: 'Submitted Form Field'
   UserDefinedForm:
+    ADDEMAILRECIPIENT: 'Dodaj e-mail odbiorcy'
+    CLEARBUTTON: Czyść
+    CONFIGURATION: Ustawienia
+    DESCRIPTION: 'Dodaj własny formularz'
+    DISABLEAUTHENICATEDFINISHACTION: 'Wyłącz uwierzytelnienie na koniec działania'
+    DISABLECSRFSECURITYTOKEN: 'Wyłącz token CSRF'
     EMAILADDRESS: Email
     EMAILBODY: Body
     EMAILFROM: From
     EMAILRECIPIENTS: 'Email Recipients'
     EMAILSUBJECT: 'Email Subject'
+    ENABLELIVEVALIDATION: 'Włącz sprawdzanie na żywo'
+    EmailFromContent: 'The from address allows you to set who the email comes from. On most servers this will need to be set to an email address on the same domain name as your site. For example on yoursite.com the from address may need to be something@yoursite.com. You can however, set any email address you wish as the reply to address.'
     FORM: Formularz
     FROMADDRESS: 'Send Email From'
+    HIDEFIELDLABELS: 'Ukryj etykiety pola'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Pokaż po zakończeniu'
     ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
     ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
+    PLURALNAME: 'Strony bazowe'
     REPLYADDRESS: 'Email z odpowiedzią do'
     SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
+    SELECTAFIELDTOSETSUBJECT: '... lub wybierz pole, które zawiera tytuł'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
     SHOWCLEARFORM: 'Show Clear Form Button'
     SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Zgłoszenia
     SUBMITBUTTON: Submit
+    TEXTONCLEAR: 'Tekst na przycisku czyść: '
     TEXTONSUBMIT: 'Napis na przycisku ''submit'':'
   UserDefinedForm_EmailRecipient:
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
+  UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Zgłoszenia filtrów ..'
+    WHEREVALUEIS: 'których wartość jest ..'
diff --git a/lang/sv.yml b/lang/sv.yml
index 3a845c7..9c0fe8d 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -149,7 +149,6 @@ sv:
     ONCOMPLETELABEL: 'Visa vid slutförande'
     ORSELECTAFIELDTOUSEASFROM: '.. eller välj ett fält att använda som svarsadress'
     ORSELECTAFIELDTOUSEASTO: '.. eller välj ett fält att använda som mottagare'
-    PLURALNAME: 'Användardefinierade formulär'
     REPLYADDRESS: 'E-postadress att svara till'
     SAVESUBMISSIONS: 'Spara inte inskickade formulär på servern'
     SELECTAFIELDTOSETSUBJECT: '.. eller välj ett fält att använda som ämne'
diff --git a/lang/zh.yml b/lang/zh.yml
index 9cf3442..e6b0af5 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -138,7 +138,6 @@ zh:
     ONCOMPLETELABEL: '完成时显示'
     ORSELECTAFIELDTOUSEASFROM: '.. 或选择某字段作为回复地址'
     ORSELECTAFIELDTOUSEASTO: '.. 或选择某字段作为地址使用'
-    PLURALNAME: '基本页面'
     REPLYADDRESS: '用于回复的电子邮件'
     SAVESUBMISSIONS: '禁用保存提交内容到服务器'
     SENDEMAILTO: '发送电子邮件到'