From 83fafdf53d214e153a1057e1feeab6eaac1cbf44 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Tue, 7 May 2024 15:29:37 +1200
Subject: [PATCH] TLN Update translations (#1284)

---
 lang/ar_SA.yml | 83 ------------------------------------------
 lang/bg_BG.yml | 83 ------------------------------------------
 lang/da_DK.yml | 83 ------------------------------------------
 lang/de.yml    |  5 ---
 lang/de_DE.yml | 17 +++------
 lang/en_GB.yml | 94 -----------------------------------------------
 lang/en_US.yml | 99 --------------------------------------------------
 lang/eo.yml    | 16 ++++----
 lang/es.yml    |  1 -
 lang/es_ES.yml |  2 -
 lang/es_MX.yml | 77 ---------------------------------------
 lang/et_EE.yml | 72 ------------------------------------
 lang/fi_FI.yml | 16 ++++----
 lang/fr.yml    | 96 +++++++++++++++++++-----------------------------
 lang/fr_FR.yml | 51 +++-----------------------
 lang/hr.yml    |  2 -
 lang/hr_HR.yml | 94 -----------------------------------------------
 lang/id.yml    |  4 --
 lang/it.yml    | 50 ++++++++++++-------------
 lang/ms_MY.yml | 85 -------------------------------------------
 lang/nb_NO.yml |  4 --
 lang/nl.yml    | 27 +++++---------
 lang/nl_NL.yml |  1 -
 lang/pl.yml    |  5 +--
 lang/pl_PL.yml | 51 +++-----------------------
 lang/pt_PT.yml | 87 --------------------------------------------
 lang/ru.yml    |  1 -
 lang/ru_RU.yml | 83 ------------------------------------------
 lang/sk.yml    | 15 +++-----
 lang/sl.yml    | 20 +++++-----
 lang/sr_RS.yml | 81 -----------------------------------------
 lang/sv.yml    |  1 -
 lang/tr_TR.yml | 84 ------------------------------------------
 33 files changed, 118 insertions(+), 1372 deletions(-)

diff --git a/lang/ar_SA.yml b/lang/ar_SA.yml
index 6ef1901..1e25c97 100644
--- a/lang/ar_SA.yml
+++ b/lang/ar_SA.yml
@@ -1,108 +1,25 @@
 ar_SA:
   SilverStripe\UserForms:
     ONCOMPLETELABEL: 'عرض الطلبات المكتملة'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: 'الملفات المرسلة'
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'النص ال'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'هذا الحقل مطلوب لهذا النموذج ولا يمكن حذفه'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'عدد الصفوف'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
     has_one_Form: النموذج
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'عرض الطلبات المكتملة'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: 'الملفات المرسلة'
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'النص ال'
     has_many_Submissions: 'الملفات المرسلة'
diff --git a/lang/bg_BG.yml b/lang/bg_BG.yml
index 0031947..889746c 100644
--- a/lang/bg_BG.yml
+++ b/lang/bg_BG.yml
@@ -1,108 +1,25 @@
 bg_BG:
   SilverStripe\UserForms:
     ONCOMPLETELABEL: 'Покажи при завършване'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: Заявления
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Текст за бутона на изпращане:'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Това поле е задължително за този формуляр и неможе да бъде изтрито'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'Номер на редове'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
     has_one_Form: Формуляр
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Покажи при завършване'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Заявления
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Текст за бутона на изпращане:'
     has_many_Submissions: Заявления
diff --git a/lang/da_DK.yml b/lang/da_DK.yml
index 705ed6e..364fcdb 100644
--- a/lang/da_DK.yml
+++ b/lang/da_DK.yml
@@ -1,108 +1,25 @@
 da_DK:
   SilverStripe\UserForms:
     ONCOMPLETELABEL: 'Vis ved gennemført'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: Indsendelse
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Tekst på send-knap'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Dette felt er påkrævet i denne formular og kan derfor ikke slettet'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'Antal rækker'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
     has_one_Form: Formular
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Vis ved gennemført'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Indsendelse
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Tekst på send-knap'
     has_many_Submissions: Indsendelse
diff --git a/lang/de.yml b/lang/de.yml
index 10f0f99..ab0cbd4 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -9,7 +9,6 @@ de:
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Abbrechen
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FILTER: Filter
     FROM: Von
     RESET: Zurücksetzen
   SilverStripe\UserForms\Model\EditableCustomRule:
@@ -18,12 +17,10 @@ de:
     CUSTOMOPTIONS: Optionen
     FIELDISREQUIRED: '{name} muss ausgefüllt werden'
     GROUP: Gruppe
-    NAME: Name
     'NO': Nein
     TITLE: Titel
     TYPE: Typ
     'YES': Ja
-    db_Name: Name
     db_Sort: Sortierung
     db_Title: Titel
     has_one_Parent: Übergeordnet
@@ -46,7 +43,6 @@ de:
   SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
     RANGE_TO: bis
   SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    db_Name: Name
     db_Sort: Sortierung
     db_Title: Titel
     has_one_Parent: Übergeordnet
@@ -62,7 +58,6 @@ de:
   SilverStripe\UserForms\Model\Submission\SubmittedForm:
     has_one_Parent: Übergeordnet
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    db_Name: Name
     db_Title: Titel
     has_one_Parent: Übergeordnet
   SilverStripe\UserForms\Model\UserDefinedForm:
diff --git a/lang/de_DE.yml b/lang/de_DE.yml
index feb5382..232b7a0 100644
--- a/lang/de_DE.yml
+++ b/lang/de_DE.yml
@@ -10,10 +10,10 @@ de_DE:
     ONCOMPLETELABEL: 'Nach Vervollständigung anzeigen'
     RECIPIENTS: Empfänger
     SAVESUBMISSIONS: 'Deaktiviere Speichern von Einsendungen auf dem Server'
-    SHOWCLEARFORM: 'Zeige ''Löschen''-Button'
+    SHOWCLEARFORM: "Zeige 'Löschen'-Button"
     SUBMISSIONS: Einsendungen
     SUBMITBUTTON: Absenden
-    TEXTONCLEAR: 'Text auf ''Löschen''-Button'
+    TEXTONCLEAR: "Text auf 'Löschen'-Button"
     TEXTONSUBMIT: 'Text auf Absende-Button'
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Abbrechen
@@ -26,7 +26,6 @@ de_DE:
     FORMFIELDS: Formularfelder
     has_many_Fields: Felder
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FILTER: Filter
     FILTERSUBMISSIONS: 'Einreichungen filtern..'
     FROM: Formular
     RESET: Zurücksetzen
@@ -49,7 +48,6 @@ de_DE:
     FIELDISREQUIRED: '{name} ist ein Pflichtfeld'
     GROUP: Gruppe
     INITIALVISIBILITY: 'Interne Sichtbarkeit'
-    NAME: Name
     'NO': Nein
     PLACEHOLDER: Platzhalter
     PLURALNAME: 'Editierbare Formularfelder'
@@ -62,7 +60,6 @@ de_DE:
     TYPE_EMPTY: 'Wähle Feld-Typ'
     VALIDATION: Validierung
     'YES': Ja
-    db_Name: Name
     db_Placeholder: Platzhalter
     db_RightTitle: 'Titel rechts'
     db_Title: Titel
@@ -81,7 +78,6 @@ de_DE:
     PLURALNAME: Datumsfelder
     SINGULARNAME: Datumsfeld
   SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
     SINGULARNAME: 'Dropdown Feld'
   SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
     PLURALNAME: E-Mail-Felder
@@ -108,9 +104,8 @@ de_DE:
     STEP_TITLE: 'Seite {page}'
     TITLE_FIRST: 'Erste Seite'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
     HIDEFROMREPORT: 'Nicht in Berichten anzeigen?'
-    HIDELABEL: '''Titel''-Label in Frontend verbergen?'
+    HIDELABEL: "'Titel'-Label in Frontend verbergen?"
     PLURALNAME: HTML-Blöcke
     SINGULARNAME: HTML-Block
   SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
@@ -134,7 +129,6 @@ de_DE:
   SilverStripe\UserForms\Model\EditableFormField\EditableOption:
     PLURALNAME: 'Editierbare Optionen'
     SINGULARNAME: 'Editierbare Option'
-    db_Name: Name
     db_Title: Titel
     db_Value: Wert
   SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
@@ -177,7 +171,6 @@ de_DE:
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
     PLURALNAME: 'Abgesendete Formularfelder'
     SINGULARNAME: 'Abgesendetes Formularfeld'
-    db_Name: Name
     db_Title: Titel
     db_Value: Wert
   SilverStripe\UserForms\Model\UserDefinedForm:
@@ -216,11 +209,11 @@ de_DE:
     SENDIFAND: 'Alle Bedingungen sind wahr'
     SENDIFOR: 'Beliebige Bedingung ist wahr'
     SENDPLAIN: 'E-Mail als Text versenden (HTML wird entfernt)'
-    SHOWCLEARFORM: 'Zeige ''Löschen''-Button'
+    SHOWCLEARFORM: "Zeige 'Löschen'-Button"
     SINGULARNAME: 'Anpassbares Formular'
     SUBMISSIONS: Einsendungen
     SUBMITBUTTON: Senden
-    TEXTONCLEAR: 'Text auf ''Löschen''-Button'
+    TEXTONCLEAR: "Text auf 'Löschen'-Button"
     TEXTONSUBMIT: 'Text auf Absende-Button'
     TYPEREPLY: 'Antwort-Adresse eingeben'
     TYPESUBJECT: 'Betreff eingeben'
diff --git a/lang/en_GB.yml b/lang/en_GB.yml
index 700f78e..03d9888 100644
--- a/lang/en_GB.yml
+++ b/lang/en_GB.yml
@@ -1,108 +1,14 @@
 en_GB:
-  SilverStripe\UserForms:
-    ONCOMPLETELABEL: 'Show on completion'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SUBMITBUTTON: Submit
-    TEXTONSUBMIT: 'Text on submit button:'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Required?'
-    SINGULARNAME: 'Editable Form Field'
-    TITLE: Title
-    VALIDATION: Validation
-    db_Title: Title
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-    db_Content: Content
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    TITLE: Title
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Title: Title
-    db_Value: Value
-  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
-    NUMBERROWS: 'Number of rows'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
-    has_one_Form: Form
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Title: Title
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
     DESCRIPTION: 'Adds a customisable form.'
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
-    ONCOMPLETELABEL: 'Show on completion'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
-    SUBMITBUTTON: Submit
-    TEXTONSUBMIT: 'Text on submit button:'
diff --git a/lang/en_US.yml b/lang/en_US.yml
index a64a0d6..3124ade 100644
--- a/lang/en_US.yml
+++ b/lang/en_US.yml
@@ -1,103 +1,4 @@
 en_US:
-  SilverStripe\UserForms:
-    ONCOMPLETELABEL: 'Show on completion'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SUBMITBUTTON: Submit
-    TEXTONSUBMIT: 'Text on submit button:'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
-  SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
-    REQUIRED: 'Is this field Required?'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
-  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
-    NUMBERROWS: 'Number of rows'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
-    db_EmailSubject: 'Email subject'
-    has_one_Form: Form
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
-  SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
-    EMAILSUBJECT: 'Email subject'
-    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.'
-    FROMADDRESS: 'Send email from'
-    HIDEFORMDATA: 'Hide form data from email?'
-    ONCOMPLETELABEL: 'Show on completion'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
-    REPLYADDRESS: 'Email for reply to'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SENDEMAILTO: 'Send email to'
-    SENDPLAIN: 'Send email as plain text? (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
-    SUBMITBUTTON: Submit
-    TEXTONSUBMIT: 'Text on submit button:'
diff --git a/lang/eo.yml b/lang/eo.yml
index 349c251..6cf9b26 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -27,7 +27,6 @@ eo:
     FOLDER_OPTIONS_TITLE: 'Agordoj pri formularaj dosierujoj'
     FORM_ACTION_CONFIRM: 'Konservi kaj daŭrigi'
     INVALID_REQUEST: 'Ĉi tiu peto ne validas.'
-    MENUTITLE: SilverStripe\UserForms\Control\UserDefinedForm
   SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
     ADD_FIELD: 'Aldoni kampon'
     ADD_FIELD_GROUP: 'Aldoni kampogrupon'
@@ -38,11 +37,11 @@ eo:
     belongs_to_SubmittedFileField: 'Kampo de sendita dosiero'
     db_UserFormUpload: 'Alŝuti formularon de uzanto'
   SilverStripe\UserForms\Extension\UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Ne eblas meti nepran kampon ''{name}'' en kondiĉa paĝo'
-    NO_PAGE: 'Trovis kampon ''{name}'' antaŭ eventualaj paĝoj'
-    UNEXPECTED_BREAK: 'Neatendita paĝosalto ''{name}'' en ingita kampo ''{group}'''
-    UNEXPECTED_GROUP_END: 'troviĝas ''{name}'' sen kongrua grupo'
-    WRONG_GROUP_END: 'trovita ''{name}'' fermas malĝustan grupon ''{group}'''
+    CONDITIONAL_REQUIRED: "Ne eblas meti nepran kampon '{name}' en kondiĉa paĝo"
+    NO_PAGE: "Trovis kampon '{name}' antaŭ eventualaj paĝoj"
+    UNEXPECTED_BREAK: "Neatendita paĝosalto '{name}' en ingita kampo '{group}'"
+    UNEXPECTED_GROUP_END: "troviĝas '{name}' sen kongrua grupo"
+    WRONG_GROUP_END: "trovita '{name}' fermas malĝustan grupon '{group}'"
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
     FILTER: Filtri
     FILTERSUBMISSIONS: 'Filtri sendaĵojn..'
@@ -205,9 +204,8 @@ eo:
     STEP_TITLE: 'Paĝo {paĝo}'
     TITLE_FIRST: 'Unua paĝo'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
     HIDEFROMREPORT: 'Ĉu kaŝi de raportoj?'
-    HIDELABEL: 'Ĉu kaŝi etikedon ''Titolo'' en fasado?'
+    HIDELABEL: "Ĉu kaŝi etikedon 'Titolo' en fasado?"
     PLURALNAME: HTML-blokoj
     PLURALS:
       one: 'Unu HTML-bloko'
@@ -385,7 +383,7 @@ eo:
     PREVIEW_EMAIL_UNAVAILABLE: 'Konservinte la ricevonton vi povos antaŭvidi la retpoŝton.'
     RECIPIENTS: Ricevontoj
     REPLYADDRESS: 'Retpoŝto al kiu respondi'
-    REPLYADDRESS_DESCRIPTION: 'La retpoŝta adreso al kiu la ricevonto povos ''respondi''.'
+    REPLYADDRESS_DESCRIPTION: "La retpoŝta adreso al kiu la ricevonto povos 'respondi'."
     RulesDescription: 'Retpoŝtoj sendiĝos al la ricevonto nur se la propraj reguloj estas plenumitaj. Se neniu regulo estas agordita, tiu ricevonto ricevos atentigon por ĉiu sendo.'
     SAVESUBMISSIONS: 'Malŝalti konservi sendaĵojn al servilo'
     SELECTAFIELDTOSETSUBJECT: '.. aŭ elekti kampon uzotan kiel la temon'
diff --git a/lang/es.yml b/lang/es.yml
index 6b6ee01..29de461 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -15,7 +15,6 @@ es:
     FIELDISREQUIRED: 'Se requiere {name} '
     GROUP: Grupo
     NAME: Nombre
-    'NO': 'No'
     TITLE: Título
     TYPE: Tipo
     'YES': Sí
diff --git a/lang/es_ES.yml b/lang/es_ES.yml
index 919bdd6..dbf207e 100644
--- a/lang/es_ES.yml
+++ b/lang/es_ES.yml
@@ -36,7 +36,6 @@ es_ES:
     FIELDISREQUIRED: '{name} es requerido'
     GROUP: Grupo
     INITIALVISIBILITY: 'Visibilidad inicial'
-    'NO': 'No'
     PLURALNAME: 'Campos de formulario editables'
     REQUIRED: 'Este campo es necesario para este formulario y no puede ser borrado'
     REQUIRED_DESCRIPTION: 'Por favor tomar en cuenta que los campos con condiciones no pueden marcarse como requeridos'
@@ -135,7 +134,6 @@ es_ES:
     ADDEMAILRECIPIENT: 'Agregar destinatario de email'
     CONFIGURATION: Configuración
     DESCRIPTION: 'Agrega un formulario personalizable.'
-    EMAILADDRESS: Email
     EMAILBODY: Cuerpo
     EMAILBODYHTML: Cuerpo
     EMAILFROM: De
diff --git a/lang/es_MX.yml b/lang/es_MX.yml
index 5a9ae85..86f5e88 100644
--- a/lang/es_MX.yml
+++ b/lang/es_MX.yml
@@ -4,129 +4,52 @@ es_MX:
   SilverStripe\UserForms:
     CLEARBUTTON: Limpiar
     ONCOMPLETELABEL: 'Mostrar cuando se complete'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: Peticiones
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Texto en el botón de envío:'
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Cancelar
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
     FILTER: Filtrar
-    FROM: From
     RESET: Resetear
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
     NAME: Nombre
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Este campo es obligatorio para el formulario y no se puede eliminar'
-    SINGULARNAME: 'Editable Form Field'
     TITLE: Título
     TYPE: Tipo
-    VALIDATION: Validation
     db_Name: Nombre
     db_Title: Título
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
   SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
     has_one_Folder: Carpeta
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
   SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
     STEP_NEXT: Siguiente
     STEP_PREV: Anterior
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
     db_Content: Contenido
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
   SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
     TITLE: Título
-    VALUE: Value
-    has_many_Options: Options
   SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
     db_Name: Nombre
     db_Title: Título
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'Número de renglones'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailAddress: 'Dirección de correo-e'
     db_EmailSubject: 'Email Subject'
     has_one_Form: Formulario
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
     db_Name: Nombre
     db_Title: Título
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
     CLEARBUTTON: Limpiar
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Mostrar cuando se complete'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Peticiones
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Texto en el botón de envío:'
     has_many_Submissions: Peticiones
diff --git a/lang/et_EE.yml b/lang/et_EE.yml
index bd765c3..e3a3833 100644
--- a/lang/et_EE.yml
+++ b/lang/et_EE.yml
@@ -3,132 +3,60 @@ et_EE:
     TABMAIN: Avaleht
   SilverStripe\UserForms:
     ONCOMPLETELABEL: 'Näita lõpetamisel'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: Kaastööd
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Kiri saatmise nupul:'
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Loobu
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
     FILTER: Filtreeri
-    FROM: From
     RESET: Lähtesta
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
     GROUP: Grupp
     NAME: Nimi
     'NO': Ei
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'See väli on vormis vajalik ja seda ei saa kustutada'
-    SINGULARNAME: 'Editable Form Field'
     TITLE: Pealkiri
-    VALIDATION: Validation
     'YES': Jah
     db_Name: Nimi
     db_Title: Pealkiri
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
   SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
     belongs_to_Group: Grupp
   SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
     has_one_Folder: Kaust
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
   SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
     STEP_NEXT: Eelmine
     STEP_PREV: Eelmine
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
     db_Content: Sisu
   SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
     has_one_Group: Grupp
   SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
     TITLE: Pealkiri
-    VALUE: Value
-    has_many_Options: Options
   SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
     RANGE_TO: kuni
   SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
     db_Name: Nimi
     db_Title: Pealkiri
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'Arv ridu'
-    PLURALNAME: 'Text Fields'
     RANGE_TO: kuni
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailAddress: 'E-posti aadressi'
     db_EmailSubject: 'Email Subject'
     has_one_Form: Vorm
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
     db_Name: Nimi
     db_Title: Pealkiri
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Näita lõpetamisel'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Kaastööd
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Kiri saatmise nupul:'
     has_many_Submissions: Kaastööd
diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml
index 31e604f..977c07a 100644
--- a/lang/fi_FI.yml
+++ b/lang/fi_FI.yml
@@ -25,7 +25,6 @@ fi_FI:
     FOLDER_OPTIONS_TITLE: 'Lomakkeen kansion asetukset'
     FORM_ACTION_CONFIRM: 'Tallenna ja jatka'
     INVALID_REQUEST: 'Pyyntö oli virheellinen'
-    MENUTITLE: SilverStripe\UserForms\Control\UserDefinedForm
   SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
     ADD_FIELD: 'Lisää kenttä'
     ADD_FIELD_GROUP: 'Lisää kenttäryhmä'
@@ -33,11 +32,11 @@ fi_FI:
     FORMFIELDS: Lomakekentät
     has_many_Fields: Kentät
   SilverStripe\UserForms\Extension\UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Pakollista kenttää ''{name}'' ei voida sijoittaa ehdolliseen sivuun'
-    NO_PAGE: 'Kenttä ''{name}'' löytyi ennen yhtäkään sivua'
-    UNEXPECTED_BREAK: 'Odottamaton sivunvaihto ''{name}'' sisäkkäisestä kentästä: ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' löydetty ilman vastaavaa ryhmää'
-    WRONG_GROUP_END: '''{name}'' sulkee väärän ryhmän: ''{group}'''
+    CONDITIONAL_REQUIRED: "Pakollista kenttää '{name}' ei voida sijoittaa ehdolliseen sivuun"
+    NO_PAGE: "Kenttä '{name}' löytyi ennen yhtäkään sivua"
+    UNEXPECTED_BREAK: "Odottamaton sivunvaihto '{name}' sisäkkäisestä kentästä: '{group}'"
+    UNEXPECTED_GROUP_END: "'{name}' löydetty ilman vastaavaa ryhmää"
+    WRONG_GROUP_END: "'{name}' sulkee väärän ryhmän: '{group}'"
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
     FILTER: Suodatin
     FILTERSUBMISSIONS: 'Suodata vastaanotettuja lomakkeita..'
@@ -54,7 +53,7 @@ fi_FI:
     CUSTOMOPTIONS: Asetukset
     CUSTOMRULES: 'Mukautetut säännöt'
     DEFAULT: Oletusarvo
-    DEFAULTTOTODAY: 'Oletus ''Tänään''?'
+    DEFAULTTOTODAY: "Oletus 'Tänään'?"
     DISPLAYIF: 'Päivitä näkyvyys kun'
     EXTRACLASS_MULTIPLE: 'Erota jokainen CSS-luokka yhdellä välilyönnillä'
     EXTRACLASS_SELECT: 'Valitse sallittujen tyylien listalta'
@@ -168,9 +167,8 @@ fi_FI:
     STEP_TITLE: 'Sivu {page}'
     TITLE_FIRST: 'Ensimmäinen sivu'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
     HIDEFROMREPORT: 'Piilota yhteenvedoista?'
-    HIDELABEL: 'Piilota ''Otsikko'' näytettävältä lomakkeelta?'
+    HIDELABEL: "Piilota 'Otsikko' näytettävältä lomakkeelta?"
     PLURALNAME: HTML-alueet
     SINGULARNAME: HTML-alue
     db_Content: Sisältö
diff --git a/lang/fr.yml b/lang/fr.yml
index 295e680..8c38f5e 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -4,15 +4,14 @@ fr:
   SilverStripe\UserForms:
     ADDEMAILRECIPIENT: 'Ajouter un mail de destination'
     CLEARBUTTON: Effacer
-    CONFIGURATION: Configuration
-    DISABLEAUTHENICATEDFINISHACTION: 'Désactiver l''authentification à la fin de l''action'
+    DISABLEAUTHENICATEDFINISHACTION: "Désactiver l'authentification à la fin de l'action"
     DISABLECSRFSECURITYTOKEN: 'Désactiver le "token" CSRF'
-    DISPLAYERRORMESSAGESATTOP: 'Afficher les messages d''erreur au dessus du formulaire'
+    DISPLAYERRORMESSAGESATTOP: "Afficher les messages d'erreur au dessus du formulaire"
     ENABLELIVEVALIDATION: 'Activer la validation en temps réel'
-    NORECIPIENTS: 'Attention: Vous n''avez configuré aucun destinataire. Les soumissions peuvent être manquées'
-    ONCOMPLETELABEL: 'Afficher après l''envoi'
+    NORECIPIENTS: "Attention: Vous n'avez configuré aucun destinataire. Les soumissions peuvent être manquées"
+    ONCOMPLETELABEL: "Afficher après l'envoi"
     RECIPIENTS: Destinataires
-    SAVESUBMISSIONS: 'Désactiver l''enregistrement des soumissions sur le serveur'
+    SAVESUBMISSIONS: "Désactiver l'enregistrement des soumissions sur le serveur"
     SHOWCLEARFORM: 'Afficher le bouton Effacer le formulaire'
     SUBMISSIONS: Soumissions
     SUBMITBUTTON: Envoyer
@@ -20,13 +19,13 @@ fr:
     TEXTONSUBMIT: 'Texte sur le bouton envoyer :'
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Annuler
-    CONFIRM_FOLDER_LABEL_A: 'Les fichiers que vos utilisateurs téléversent doivent être stockés avec soin pour réduire le risque d''exposition de données sensibles. Assurez-vous que le dossier que vous sélectionnez ne peut être consulté que par les parties appropriées. Les autorisations des dossiers peuvent être gérées dans la zone Fichiers.'
+    CONFIRM_FOLDER_LABEL_A: "Les fichiers que vos utilisateurs téléversent doivent être stockés avec soin pour réduire le risque d'exposition de données sensibles. Assurez-vous que le dossier que vous sélectionnez ne peut être consulté que par les parties appropriées. Les autorisations des dossiers peuvent être gérées dans la zone Fichiers."
     CONFIRM_FOLDER_LABEL_B: 'Le dossier sélectionné deviendra le dossier par défaut pour ce formulaire. Cela peut être modifié individuellement dans le champ <i>File uploaded field</i>'
     FOLDER_OPTIONS_EXISTING: 'Utiliser un dossier existant'
     FOLDER_OPTIONS_NEW: 'Créer un nouveau dossier (recommandé)'
     FOLDER_OPTIONS_TITLE: 'Options du dossier du formulaire'
     FORM_ACTION_CONFIRM: 'Sauvegarder et continuer'
-    INVALID_REQUEST: 'Cette requête n''était pas valide'
+    INVALID_REQUEST: "Cette requête n'était pas valide"
   SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
     ADD_FIELD: 'Ajouter un champ'
     ADD_FIELD_GROUP: 'Ajouter un group de champs'
@@ -37,17 +36,17 @@ fr:
     belongs_to_SubmittedFileField: 'Champ du fichier soumis'
     db_UserFormUpload: 'Téléversement du formulaire utilisateur'
   SilverStripe\UserForms\Extension\UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Le champ obligatoire ''{name}'' ne peut être placé dans une page conditionnelle'
-    NO_PAGE: 'Champ ''{name}'' trouvé avant toutes pages'
-    UNEXPECTED_BREAK: 'Un séparateur de page ''{name}'' inattendu imbriqué dans ''{group}'' de champs'
-    UNEXPECTED_GROUP_END: '''{name}'' trouvé sans groupe correspondant'
-    WRONG_GROUP_END: '''{name}'' trouvé ferme le mauvais groupe ''{group}'''
+    CONDITIONAL_REQUIRED: "Le champ obligatoire '{name}' ne peut être placé dans une page conditionnelle"
+    NO_PAGE: "Champ '{name}' trouvé avant toutes pages"
+    UNEXPECTED_BREAK: "Un séparateur de page '{name}' inattendu imbriqué dans '{group}' de champs"
+    UNEXPECTED_GROUP_END: "'{name}' trouvé sans groupe correspondant"
+    WRONG_GROUP_END: "'{name}' trouvé ferme le mauvais groupe '{group}'"
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
     FILTER: Filtrer
     FILTERSUBMISSIONS: 'Filtrer les soumissions..'
     FROM: De
     RESET: Réinitialiser
-    TILL: 'Jusqu''au'
+    TILL: "Jusqu'au"
     WHEREVALUEIS: 'Où la valeur est..'
   SilverStripe\UserForms\Model\EditableCustomRule:
     PLURALNAME: 'Règles personnalisées modifiables'
@@ -59,16 +58,13 @@ fr:
     db_ConditionOption: 'Option de condition'
     db_Display: Afficher
     db_FieldValue: 'Valeur du champ'
-    db_Version: Version
     has_one_ConditionField: 'Champ de condition'
-    has_one_Parent: Parent
   SilverStripe\UserForms\Model\EditableFormField:
     CHECKEDBYDEFAULT: 'Coché par défaut ?'
-    CUSTOMERROR: 'Message d''erreur personnalisé'
-    CUSTOMOPTIONS: Options
+    CUSTOMERROR: "Message d'erreur personnalisé"
     CUSTOMRULES: 'Règles personnalisées'
     DEFAULT: 'Valeur par défaut'
-    DEFAULTTOTODAY: 'Par défaut Aujourd''hui ?'
+    DEFAULTTOTODAY: "Par défaut Aujourd'hui ?"
     DISPLAYIF: 'Basculer la visibilité lorsque'
     EXTRACLASS_MULTIPLE: 'Séparer chaque classe CSS avec un seul espace'
     EXTRACLASS_SELECT: 'Sélectionnez dans la liste des styles autorisés'
@@ -83,11 +79,9 @@ fr:
     REQUIRED_DESCRIPTION: 'Veuillez noter que les champs conditionnels ne peuvent pas être obligatoires'
     RIGHTTITLE: 'Titre à droite'
     TITLE: Titre
-    TYPE: Type
     TYPE_EMPTY: 'Sélectionner le type de champ'
-    VALIDATION: Validation
     'YES': Oui
-    db_CustomErrorMessage: 'Message d''erreur personnalisé'
+    db_CustomErrorMessage: "Message d'erreur personnalisé"
     db_Default: 'Par défaut'
     db_Name: Nom
     db_Required: Obligatoire
@@ -96,9 +90,7 @@ fr:
     db_ShowOnLoad: 'Afficher lors du chargement'
     db_Sort: Tri
     db_Title: Titre
-    db_Version: Version
     has_many_DisplayRules: 'Afficher les règles'
-    has_one_Parent: Parent
   SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
     PLURALNAME: 'Cases à cocher'
     PLURALS:
@@ -133,7 +125,7 @@ fr:
       one: 'Un champ date'
       other: '{count} champs dates'
     SINGULARNAME: 'Champ date'
-    db_DefaultToToday: 'Par défaut, aujourd''hui'
+    db_DefaultToToday: "Par défaut, aujourd'hui"
   SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
     PLURALNAME: 'Liste déroulante'
     PLURALS:
@@ -191,10 +183,8 @@ fr:
     SINGULARNAME: 'Séparateur de page'
     STEP_NEXT: Suivant
     STEP_PREV: Préc
-    STEP_TITLE: 'Page {page}'
     TITLE_FIRST: 'Première page'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
     HIDEFROMREPORT: 'Masqué des rapports ?'
     PLURALNAME: 'Bloc HTML'
     PLURALS:
@@ -214,10 +204,8 @@ fr:
     has_one_Group: Groupe
   SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
     DEFAULT: 'Sélectionné par défaut ?'
-    OPTIONSTAB: Options
     TITLE: Titre
     VALUE: Valeur
-    has_many_Options: Options
   SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
     ORDER_WARNING: 'La longueur minimale devra être inférieur à la longueur maximale.'
     PLURALNAME: 'Champs numériques'
@@ -242,8 +230,6 @@ fr:
     db_Sort: Tri
     db_Title: Titre
     db_Value: Valeur
-    db_Version: Version
-    has_one_Parent: Parent
   SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
     PLURALNAME: 'Groupes de radio'
     PLURALS:
@@ -271,22 +257,22 @@ fr:
     db_Rows: Lignes
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
     CUSTOMRULESTAB: 'Règles personnalisées'
-    EMAILCONTENTTAB: 'Contenu de l''e-mail'
-    EMAILDETAILSTAB: 'Détails de l''e-mail'
+    EMAILCONTENTTAB: "Contenu de l'e-mail"
+    EMAILDETAILSTAB: "Détails de l'e-mail"
     EMAILFROMREQUIRED: 'L''adresse "E-mail de" est requise'
     EMAILTOREQUIRED: 'L''adresse "Envoyer l''email à" ou le champ est obligatoire'
     PLURALNAME: 'Destinataires des e-mails'
     PLURALS:
-      many: '{count} destinataires d''e-mail'
-      one: 'Un destinataire d''e-mail'
-      other: '{count} destinataires d''e-mail'
-    SINGULARNAME: 'Destinataire d''e-mail'
+      many: "{count} destinataires d'e-mail"
+      one: "Un destinataire d'e-mail"
+      other: "{count} destinataires d'e-mail"
+    SINGULARNAME: "Destinataire d'e-mail"
     db_EmailAddress: 'Adresse email'
-    db_EmailBody: 'Corps de l''e-mail'
-    db_EmailBodyHtml: 'Corps de l''e-mail HTML'
+    db_EmailBody: "Corps de l'e-mail"
+    db_EmailBodyHtml: "Corps de l'e-mail HTML"
     db_EmailFrom: 'Email de'
-    db_EmailSubject: 'Sujet de l''email'
-    db_EmailTemplate: 'Modèle d''e-mail'
+    db_EmailSubject: "Sujet de l'email"
+    db_EmailTemplate: "Modèle d'e-mail"
     db_HideFormData: 'Masquer les données du formulaire'
     db_HideInvisibleFields: 'Masquer les champs invisibles'
     has_many_CustomRules: 'Règles personnalisées'
@@ -294,7 +280,6 @@ fr:
   SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition:
     db_ConditionOption: 'Option de condition'
     has_one_ConditionField: 'Champ de condition'
-    has_one_Parent: Parent
   SilverStripe\UserForms\Model\Submission\SubmittedFileField:
     DOWNLOADFILE: 'Télécharger le fichier'
     INSUFFICIENTRIGHTS: 'Vous ne disposez pas les autorisations nécessaires pour télécharger ce fichier'
@@ -308,37 +293,32 @@ fr:
     SINGULARNAME: 'Formulaire soumis'
     SUBMITTER: Soumissionnaire
     has_many_Values: Valeurs
-    has_one_Parent: Parent
     has_one_SubmittedBy: 'Soumis par'
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
     db_Displayed: Affiché
     db_Name: Nom
     db_Title: Titre
     db_Value: Valeur
-    has_one_Parent: Parent
   SilverStripe\UserForms\Model\UserDefinedForm:
     ADDEMAILRECIPIENT: 'Ajouter un mail de destination'
     CLEARBUTTON: Effacer
-    CONFIGURATION: Configuration
-    DISABLEAUTHENICATEDFINISHACTION: 'Désactiver l''authentification à la fin de l''action'
+    DISABLEAUTHENICATEDFINISHACTION: "Désactiver l'authentification à la fin de l'action"
     DISABLECSRFSECURITYTOKEN: 'Désactiver le jeton CSRF'
-    DISPLAYERRORMESSAGESATTOP: 'Afficher les messages d''erreur au dessus du formulaire'
-    EMAILADDRESS: Email
+    DISPLAYERRORMESSAGESATTOP: "Afficher les messages d'erreur au dessus du formulaire"
     EMAILFROM: De
-    EMAILSUBJECT: 'Sujet de l''email'
-    EMAILTEMPLATE: 'Modèle d''e-mail'
+    EMAILSUBJECT: "Sujet de l'email"
+    EMAILTEMPLATE: "Modèle d'e-mail"
     ENABLELIVEVALIDATION: 'Activer la validation en temps réel'
-    NORECIPIENTS: 'Attention: Vous n''avez configuré aucun destinataire. Les soumissions peuvent être manquées'
+    NORECIPIENTS: "Attention: Vous n'avez configuré aucun destinataire. Les soumissions peuvent être manquées"
     ONCOMPLETELABEL: 'Afficher après la soumission'
     ONCOMPLETEMESSAGE: 'Merci, nous avons reçu votre soumission.'
-    PLURALNAME: 'Base Pages'
-    PREVIEW_EMAIL: 'Aperçu de l''e-mail'
-    PREVIEW_EMAIL_DESCRIPTION: 'Remarque: Les modifications non enregistrées n''apparaissent pas dans l''aperçu'
+    PREVIEW_EMAIL: "Aperçu de l'e-mail"
+    PREVIEW_EMAIL_DESCRIPTION: "Remarque: Les modifications non enregistrées n'apparaissent pas dans l'aperçu"
     PREVIEW_EMAIL_UNAVAILABLE: 'Vous pouvez prévisualiser cet e-mail une fois que vous avez enregistré le destinataire.'
     RECIPIENTS: Destinataires
     SAVESUBMISSIONS: 'Désactiver le sauvegarde des soumissions sur le serveur'
     SELECTAFIELDTOSETSUBJECT: '.. ou sélectionnez un champ à utiliser comme sujet'
-    SENDEMAILTO: 'Envoyer l''e-mail à'
+    SENDEMAILTO: "Envoyer l'e-mail à"
     SENDEMAILTO_DESCRIPTION: 'Vous pouvez saisir une liste de plusieurs adresses e-mails séparée par des virgules'
     SENDIFAND: 'Toutes les conditions sont vraies'
     SHOWCLEARFORM: 'Afficher le bouton Effacer le formulaire'
@@ -346,14 +326,14 @@ fr:
     SUBMITBUTTON: Envoyer
     TEXTONCLEAR: 'Texte sur le bouton effacer'
     TEXTONSUBMIT: 'Texte sur le bouton envoyer :'
-    UnrestrictedFileUploadWarning: 'L''accès au dossier de téléversement actuel "{path}" n''est pas restreint. Les fichiers téléversés seront accessibles au public si l''URL exacte est connue.'
+    UnrestrictedFileUploadWarning: "L'accès au dossier de téléversement actuel \"{path}\" n'est pas restreint. Les fichiers téléversés seront accessibles au public si l'URL exacte est connue."
     db_ClearButtonText: 'Effacer le texte du bouton'
     db_DisableCsrfSecurityToken: 'Désactiver le token de sécurité CSRF'
     db_DisableSaveSubmissions: 'Désactiver le sauvegardes des soumissions'
-    db_DisplayErrorMessagesAtTop: 'Afficher les messages d''erreur en haut'
+    db_DisplayErrorMessagesAtTop: "Afficher les messages d'erreur en haut"
     db_EnableLiveValidation: 'Activer la validation en temps réel'
     db_ShowClearButton: 'Afficher le bouton effacer'
-    db_SubmitButtonText: 'Texte du bouton d''envoi'
+    db_SubmitButtonText: "Texte du bouton d'envoi"
     has_many_EmailRecipients: 'Mails destinataires'
     has_many_Fields: Champs
     has_many_Submissions: Soumissions
diff --git a/lang/fr_FR.yml b/lang/fr_FR.yml
index b0fddd2..79dc0c3 100644
--- a/lang/fr_FR.yml
+++ b/lang/fr_FR.yml
@@ -1,34 +1,23 @@
 fr_FR:
   SilverStripe\UserForms:
     ONCOMPLETELABEL: 'Utiliser la complétion'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: Soumissions
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Texte du bouton Envoyer :'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
     CHECKEDBYDEFAULT: 'Vérifié par défaut ?'
-    CUSTOMERROR: 'Message d''erreur personnalisé'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Par défaut pour aujourd''hui ?'
+    CUSTOMERROR: "Message d'erreur personnalisé"
+    DEFAULTTOTODAY: "Par défaut pour aujourd'hui ?"
     EXTRACLASS_TITLE: 'Style/sortie supplémentaire'
     GROUP: Groupe
     PLURALNAME: 'Champs de formulaire modifiable'
     REQUIRED: 'Ce champ est requis pour ce formulaire et ne peut pas être supprimé'
     SINGULARNAME: 'Champ de formulaire modifiable'
-    VALIDATION: Validation
   SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
     PLURALNAME: 'Cases à cocher'
     SINGULARNAME: 'Champ de la case à cocher'
   SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
     PLURALNAME: 'Groupes de case à cocher'
     SINGULARNAME: 'Groupe de case à cocher'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
   SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
     PLURALNAME: 'Champs date'
     SINGULARNAME: 'Champ date'
@@ -41,26 +30,16 @@ fr_FR:
   SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
     belongs_to_Group: Groupe
   SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'Champs pour l''upload de fichier'
-    SINGULARNAME: 'Champ pour l''upload de fichier'
+    PLURALNAME: "Champs pour l'upload de fichier"
+    SINGULARNAME: "Champ pour l'upload de fichier"
   SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
     LEVEL: 'Sélectionnez le niveau de tête'
     PLURALNAME: Principaux
     SINGULARNAME: Principal
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
   SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
     has_one_Group: Groupe
   SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
     VALUE: Valeur
-    has_many_Options: Options
   SilverStripe\UserForms\Model\EditableFormField\EditableOption:
     PLURALNAME: 'Options modifiables'
     SINGULARNAME: 'Option modifiable'
@@ -70,42 +49,22 @@ fr_FR:
     PLURALNAME: 'Champs texte'
     SINGULARNAME: 'Champ texte'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
     has_one_Form: Formulaire
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
     db_Value: Valeur
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
-    EmailFromContent: 'Le champ pour l''adresse de vous permet de définir d''où provient l''email. Sur la plupart des serveurs cela nécessitera que l''adresse mail soit du même domaine que votre site. Par exemple sur votresite.com l''adresse mail devra sûrement être exemple@votresite.com. Cependant vous pouvez mettre n''importe qu''elle adresse email, à laquelle vous souhaitez qu''on réponde. '
+    EmailFromContent: "Le champ pour l'adresse de vous permet de définir d'où provient l'email. Sur la plupart des serveurs cela nécessitera que l'adresse mail soit du même domaine que votre site. Par exemple sur votresite.com l'adresse mail devra sûrement être exemple@votresite.com. Cependant vous pouvez mettre n'importe qu'elle adresse email, à laquelle vous souhaitez qu'on réponde. "
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Utiliser la complétion'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
     REPLYADDRESS: 'Email pour répondre à'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Soumissions
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Texte du bouton Envoyer :'
     has_many_Submissions: Soumissions
diff --git a/lang/hr.yml b/lang/hr.yml
index 9ae8b5b..33b616f 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -7,7 +7,6 @@ hr:
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Odustani
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FILTER: Filter
     FROM: Od
     RESET: Resetiraj
   SilverStripe\UserForms\Model\EditableCustomRule:
@@ -55,6 +54,5 @@ hr:
   SilverStripe\UserForms\Model\UserDefinedForm:
     CLEARBUTTON: Očisti
     CONFIGURATION: Konfiguracija
-    EMAILADDRESS: Email
     EMAILFROM: Od
     PLURALNAME: 'Osnovne stranice'
diff --git a/lang/hr_HR.yml b/lang/hr_HR.yml
index 42f956a..3c64ff9 100644
--- a/lang/hr_HR.yml
+++ b/lang/hr_HR.yml
@@ -1,108 +1,14 @@
 hr_HR:
-  SilverStripe\UserForms:
-    ONCOMPLETELABEL: 'Show on completion'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SUBMISSIONS: Submissions
-    SUBMITBUTTON: Submit
-    TEXTONSUBMIT: 'Text on submit button:'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Ovo je polje obavezno u ovoj formi i ne može biti obrisano.'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
-  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
-    NUMBERROWS: 'Number of rows'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
-    has_one_Form: Form
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
-    ONCOMPLETELABEL: 'Show on completion'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
-    SUBMISSIONS: Submissions
-    SUBMITBUTTON: Submit
-    TEXTONSUBMIT: 'Text on submit button:'
-    has_many_Submissions: Submissions
diff --git a/lang/id.yml b/lang/id.yml
index 77dffeb..25ca525 100644
--- a/lang/id.yml
+++ b/lang/id.yml
@@ -6,7 +6,6 @@ id:
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
     FILTER: Saring
     FROM: Dari
-    RESET: Reset
   SilverStripe\UserForms\Model\EditableCustomRule:
     has_one_Parent: Induk
   SilverStripe\UserForms\Model\EditableFormField:
@@ -23,8 +22,6 @@ id:
     has_one_Parent: Induk
   SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
     belongs_to_Group: Grup
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    has_one_Folder: Folder
   SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
     STEP_NEXT: Selanjutnya
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
@@ -53,7 +50,6 @@ id:
     db_Value: Nilai
     has_one_Parent: Induk
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
     EMAILFROM: Dari
     EMAILSUBJECT: 'Subyek email'
     PLURALNAME: 'Laman Dasar'
diff --git a/lang/it.yml b/lang/it.yml
index 3d60117..997a9ae 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -5,7 +5,7 @@ it:
     ADDEMAILRECIPIENT: 'Aggiungi destinatario e-mail'
     CLEARBUTTON: Azzera
     CONFIGURATION: Configurazione
-    DISABLEAUTHENICATEDFINISHACTION: 'Disabilita autenticazione sull''azione finale'
+    DISABLEAUTHENICATEDFINISHACTION: "Disabilita autenticazione sull'azione finale"
     DISABLECSRFSECURITYTOKEN: 'Disabilita token CSRF'
     DISPLAYERRORMESSAGESATTOP: 'Mostra messaggi di errore sopra il modulo?'
     ENABLELIVEVALIDATION: 'Abilita la validazione in tempo reale'
@@ -27,11 +27,11 @@ it:
     FORMFIELDS: 'Campi del modulo'
     has_many_Fields: Campi
   SilverStripe\UserForms\Extension\UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Il campo richiesto ''{name}'' non può essere posizionato all''interno di una pagina condizionale'
-    NO_PAGE: 'Il campo ''{name}'' è stato trovato prima di una qualunque pagina'
-    UNEXPECTED_BREAK: 'Interruzione di pagina ''{name}'' inattesa all''interno del campo nidificato ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' trovato senza un gruppo corrispondente'
-    WRONG_GROUP_END: '''{name}'' trovato chiude il gruppo sbagliato ''{group}'''
+    CONDITIONAL_REQUIRED: "Il campo richiesto '{name}' non può essere posizionato all'interno di una pagina condizionale"
+    NO_PAGE: "Il campo '{name}' è stato trovato prima di una qualunque pagina"
+    UNEXPECTED_BREAK: "Interruzione di pagina '{name}' inattesa all'interno del campo nidificato '{group}'"
+    UNEXPECTED_GROUP_END: "'{name}' trovato senza un gruppo corrispondente"
+    WRONG_GROUP_END: "'{name}' trovato chiude il gruppo sbagliato '{group}'"
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
     FILTER: Filtra
     FILTERSUBMISSIONS: 'Filtra invii..'
@@ -57,7 +57,6 @@ it:
     FIELDISREQUIRED: '{name} è richiesto'
     GROUP: Gruppo
     NAME: Nome
-    'NO': 'No'
     PLACEHOLDER: Segnaposto
     PLURALNAME: 'Campi modulo modificabili'
     REQUIRED: 'Questo campo è obbligatorio?'
@@ -119,9 +118,8 @@ it:
     STEP_TITLE: 'Pagina {page}'
     TITLE_FIRST: 'Prima pagina'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
     HIDEFROMREPORT: 'Nascondi dai rapporti?'
-    HIDELABEL: 'Nascondi etichetta ''Titolo'' dal frontend?'
+    HIDELABEL: "Nascondi etichetta 'Titolo' dal frontend?"
     PLURALNAME: 'Blocchi HTML'
     SINGULARNAME: 'Blocco HTML'
     db_Content: Contenuto
@@ -162,17 +160,17 @@ it:
     TEXTLENGTH: 'Lunghezza testo consentita'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
     CUSTOMRULESTAB: 'Regole personalizzate'
-    EMAILCONTENTTAB: 'Contenuto dell''e-mail'
-    EMAILDETAILSTAB: 'Dettagli dell''e-mail'
-    PLURALNAME: 'Destinatari e-mail del modulo definito dall''utente'
-    SINGULARNAME: 'Destinatario e-mail del modulo definito dall''utente'
+    EMAILCONTENTTAB: "Contenuto dell'e-mail"
+    EMAILDETAILSTAB: "Dettagli dell'e-mail"
+    PLURALNAME: "Destinatari e-mail del modulo definito dall'utente"
+    SINGULARNAME: "Destinatario e-mail del modulo definito dall'utente"
     db_EmailAddress: 'Indirizzo email'
     db_EmailSubject: 'Oggetto e-mail'
     db_EmailTemplate: 'Schema e-mail'
     has_one_Form: Modulo
   SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition:
-    PLURALNAME: 'Condizioni per il destinatario del modulo definito dall''utente'
-    SINGULARNAME: 'Condizione per il destinatario del modulo definito dall''utente'
+    PLURALNAME: "Condizioni per il destinatario del modulo definito dall'utente"
+    SINGULARNAME: "Condizione per il destinatario del modulo definito dall'utente"
     has_one_Parent: Parente
   SilverStripe\UserForms\Model\Submission\SubmittedFileField:
     DOWNLOADFILE: 'Scarica file'
@@ -194,7 +192,7 @@ it:
     CLEARBUTTON: Azzera
     CONFIGURATION: Configurazione
     DESCRIPTION: 'Aggiungi un modulo personalizzabile.'
-    DISABLEAUTHENICATEDFINISHACTION: 'Disabilita autenticazione sull''azione finale'
+    DISABLEAUTHENICATEDFINISHACTION: "Disabilita autenticazione sull'azione finale"
     DISABLECSRFSECURITYTOKEN: 'Disabilita token CSRF'
     DISPLAYERRORMESSAGESATTOP: 'Mostra messaggi di errore sopra il modulo?'
     EMAILADDRESS: E-mail
@@ -204,20 +202,20 @@ it:
     EMAILSUBJECT: 'Oggetto e-mail'
     EMAILTEMPLATE: 'Schema e-mail'
     ENABLELIVEVALIDATION: 'Abilita la validazione in tempo reale'
-    EmailFromContent: 'L''indirizzo mittente ti permette di impostare da chi viene l''e-mail. Su molti server questo sarà impostato su un indirizzo e-mail dello stesso nome a dominio del tuo sito. Per esempio su iltuosito.com l''indirizzo mittente potrebbe essere qualcuno@iltuosito.com. Puoi, comunque, impostare qualunque indirizzo email desideri come indirizzo a cui rispondere.'
+    EmailFromContent: "L'indirizzo mittente ti permette di impostare da chi viene l'e-mail. Su molti server questo sarà impostato su un indirizzo e-mail dello stesso nome a dominio del tuo sito. Per esempio su iltuosito.com l'indirizzo mittente potrebbe essere qualcuno@iltuosito.com. Puoi, comunque, impostare qualunque indirizzo email desideri come indirizzo a cui rispondere."
     FROMADDRESS: 'Manda e-mail da'
-    HIDEFORMDATA: 'Nascondi dati del modulo nell''email?'
+    HIDEFORMDATA: "Nascondi dati del modulo nell'email?"
     NORECIPIENTS: 'Attenzione: Non hai configurato nessun destinatario. Potresti perderti delle risposte al modulo.'
     ONCOMPLETELABEL: 'Mostra al completamento'
     ORSELECTAFIELDTOUSEASFROM: '.. o seleziona un campo da usare come indirizzo a cui rispondere'
     ORSELECTAFIELDTOUSEASTO: '.. o seleziona un campo da usare come indirizzo destinatario'
     PLURALNAME: 'Pagine Base'
     PREVIEW_EMAIL: 'Anteprima e-mail'
-    PREVIEW_EMAIL_DESCRIPTION: 'Nota: Le modifiche non salvate non appariranno nell''anteprima'
-    PREVIEW_EMAIL_UNAVAILABLE: 'Puoi vedere un''anteprima di questa email dopo aver salvato il destinatario.'
+    PREVIEW_EMAIL_DESCRIPTION: "Nota: Le modifiche non salvate non appariranno nell'anteprima"
+    PREVIEW_EMAIL_UNAVAILABLE: "Puoi vedere un'anteprima di questa email dopo aver salvato il destinatario."
     RECIPIENTS: Destinatari
     REPLYADDRESS: 'Indirizzo e-mail a cui rispondere'
-    REPLYADDRESS_DESCRIPTION: 'L''indirizzo email a cui il destinatario può ''rispondere''.'
+    REPLYADDRESS_DESCRIPTION: "L'indirizzo email a cui il destinatario può 'rispondere'."
     RulesDescription: 'Le email saranno spedite solo al destinatario se sono soddisfatte le regole personalizzate. Se non è definita nessuna regola, il destinatario riceverà notifiche per ogni invio.'
     SAVESUBMISSIONS: 'Disabilita il salvataggio degli invii sul server'
     SELECTAFIELDTOSETSUBJECT: '.. o seleziona un campo da usare come oggetto'
@@ -226,16 +224,16 @@ it:
     SENDIF: 'Condizione di invio'
     SENDIFAND: 'Tutte le condizioni sono vere'
     SENDIFOR: 'Una qualunque delle condizioni è vera'
-    SENDPLAIN: 'Manda e-mail come testo semplice? (L''HTML verrà rimosso)'
+    SENDPLAIN: "Manda e-mail come testo semplice? (L'HTML verrà rimosso)"
     SHOWCLEARFORM: 'Mostra il pulsante per azzerare il modulo'
-    SINGULARNAME: 'Modulo definito dall''utente'
+    SINGULARNAME: "Modulo definito dall'utente"
     SUBMISSIONS: Invii
     SUBMITBUTTON: Invia
     TEXTONCLEAR: 'Testo sul pulsante di azzeramento:'
     TEXTONSUBMIT: 'Testo sul pulsante di invio:'
-    TYPEREPLY: 'Inserisci l''e-mail di risposta'
-    TYPESUBJECT: 'Inserisci l''oggetto'
-    TYPETO: 'Inserisci l''e-mail destinatario'
+    TYPEREPLY: "Inserisci l'e-mail di risposta"
+    TYPESUBJECT: "Inserisci l'oggetto"
+    TYPETO: "Inserisci l'e-mail destinatario"
     db_EnableLiveValidation: 'Abilita la validazione in tempo reale'
     has_many_Fields: Campi
     has_many_Submissions: Invii
diff --git a/lang/ms_MY.yml b/lang/ms_MY.yml
index ea56fb8..203b8cc 100644
--- a/lang/ms_MY.yml
+++ b/lang/ms_MY.yml
@@ -1,108 +1,23 @@
 ms_MY:
   SilverStripe\UserForms:
     ONCOMPLETELABEL: 'Paparkan setelah lengkap'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: Kiriman
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Teks di atas butang hantar:'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Medan ini diperlukan untuk borang ini dan tidak boleh dihapuskan'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
-  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
-    NUMBERROWS: 'Number of rows'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
     has_one_Form: Borang
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Paparkan setelah lengkap'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Kiriman
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Teks di atas butang hantar:'
     has_many_Submissions: Kiriman
diff --git a/lang/nb_NO.yml b/lang/nb_NO.yml
index 713ba8f..9d146bf 100644
--- a/lang/nb_NO.yml
+++ b/lang/nb_NO.yml
@@ -10,10 +10,8 @@ nb_NO:
     SUBMITBUTTON: Send
     TEXTONSUBMIT: 'Tekst på "send" knapp'
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FILTER: Filter
     FILTERSUBMISSIONS: 'Filtrer innsendte...'
     FROM: Fra
-    RESET: Reset
     WHEREVALUEIS: 'hvor verdi er...'
   SilverStripe\UserForms\Model\EditableFormField:
     CHECKEDBYDEFAULT: 'Valgt som standard?'
@@ -105,8 +103,6 @@ nb_NO:
     CONFIGURATION: Konfigurasjon
     DESCRIPTION: 'Legg til konfigurerbart skjema'
     EMAILADDRESS: Epost
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
     EMAILFROM: Fra
     EMAILSUBJECT: 'Epost emne'
     ENABLELIVEVALIDATION: 'Slå på sanntid validering'
diff --git a/lang/nl.yml b/lang/nl.yml
index 848d8a5..6886c26 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -27,7 +27,6 @@ nl:
     FOLDER_OPTIONS_TITLE: Map-instellingen
     FORM_ACTION_CONFIRM: 'Opslaan en verder'
     INVALID_REQUEST: 'Aanroep mislukt'
-    MENUTITLE: SilverStripe\UserForms\Control\UserDefinedForm
   SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
     ADD_FIELD: 'Veld toevoegen'
     ADD_FIELD_GROUP: 'Veldengroep toevoegen'
@@ -38,13 +37,12 @@ nl:
     belongs_to_SubmittedFileField: 'Geupload-bestand veld'
     db_UserFormUpload: 'Zelf-instelbaar formulier upload'
   SilverStripe\UserForms\Extension\UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Het verplichte veld ''{}'' kan niet in een optionele pagina geplaatst worden'
-    NO_PAGE: 'Veld ''{}'' staat vóór eerste pagina'
-    UNEXPECTED_BREAK: 'Onverwachte nieuwe pagina gevonden ''{name}'', binnen een veldengroep ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' gevonden zonder bijbehorende groep'
-    WRONG_GROUP_END: '''{name}'' gevonden, welke de verkeerde groep sluit ''{group}'''
+    CONDITIONAL_REQUIRED: "Het verplichte veld '{}' kan niet in een optionele pagina geplaatst worden"
+    NO_PAGE: "Veld '{}' staat vóór eerste pagina"
+    UNEXPECTED_BREAK: "Onverwachte nieuwe pagina gevonden '{name}', binnen een veldengroep '{group}'"
+    UNEXPECTED_GROUP_END: "'{name}' gevonden zonder bijbehorende groep"
+    WRONG_GROUP_END: "'{name}' gevonden, welke de verkeerde groep sluit '{group}'"
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FILTER: Filter
     FILTERSUBMISSIONS: 'Inzendingen filteren'
     FROM: Afzender
     RESET: Resetten
@@ -80,7 +78,6 @@ nl:
     MERGEFIELDNAME: 'Merge code'
     NAME: Naam
     'NO': Nee
-    PLACEHOLDER: Placeholder
     PLURALNAME: 'Bewerkbare formuliervelden'
     PLURALS:
       one: 'Bewerkbare formulierveld'
@@ -98,9 +95,7 @@ nl:
     db_CustomErrorMessage: 'Eigen foutmelding'
     db_Default: Standaard
     db_DisplayRulesConjunction: 'Weergave regels samenvoeging'
-    db_ExtraClass: 'Extra class'
     db_Name: Naam
-    db_Placeholder: Placeholder
     db_Required: Verplicht
     db_RightTitle: 'Titel rechts'
     db_ShowInSummary: 'Toon in overzicht'
@@ -193,21 +188,19 @@ nl:
       other: '{count} kopje'
     SINGULARNAME: Kopje
     db_HideFromReports: 'Verberg van rapporten'
-    db_Level: Level
   SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
     PLURALNAME: 'Nieuwe pagina'
     PLURALS:
       one: 'Nieuwe pagina'
-      other: '{count} nieuwe pagina''s'
+      other: "{count} nieuwe pagina's"
     SINGULARNAME: 'Nieuwe pagina'
     STEP_NEXT: Volgende
     STEP_PREV: Vorige
     STEP_TITLE: 'Pagina {page}'
     TITLE_FIRST: 'Eerste pagina'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
     HIDEFROMREPORT: 'Verbergen in overzichten'
-    HIDELABEL: 'Verberg ''Titel'' label in het formulier'
+    HIDELABEL: "Verberg 'Titel' label in het formulier"
     PLURALNAME: 'HTML blokken'
     PLURALS:
       one: 'Een HTML blok'
@@ -376,16 +369,16 @@ nl:
     ONCOMPLETEMESSAGE: 'Bedankt voor uw inzending, deze is in goede orde ontvangen.'
     ORSELECTAFIELDTOUSEASFROM: '.. of selecteer een veld om te gebruiken als antwoord-adres'
     ORSELECTAFIELDTOUSEASTO: '.. of selecteer een veld om te gebruiken als ontvanger'
-    PLURALNAME: 'Formulierpagina''s'
+    PLURALNAME: "Formulierpagina's"
     PLURALS:
       one: Formulierpagina
-      other: '{count} Formulierpagina''s'
+      other: "{count} Formulierpagina's"
     PREVIEW_EMAIL: 'Voorbeeld van e-mail bekijken'
     PREVIEW_EMAIL_DESCRIPTION: 'Let op: sla eerst de wijzigingen op, om deze in het voorbeeld te kunnen bekijken.'
     PREVIEW_EMAIL_UNAVAILABLE: 'De e-mail is te bekijken, als er een ontvanger is opgeslagen'
     RECIPIENTS: Ontvangers
     REPLYADDRESS: 'E-mail voor antwoord op'
-    REPLYADDRESS_DESCRIPTION: 'Het mailadres waarnaar een reactie verzonden wordt, als je op ''reply'' klikt.'
+    REPLYADDRESS_DESCRIPTION: "Het mailadres waarnaar een reactie verzonden wordt, als je op 'reply' klikt."
     RulesDescription: 'De e-mail wordt alleen verstuurd als aan deze voorwaarden voldaan is. Als er geen voorwaarden ingesteld zijn, wordt bij elke inzending een mail gestuurd.'
     SAVESUBMISSIONS: 'Formulier-inzendingen niet opslaan in het CMS'
     SELECTAFIELDTOSETSUBJECT: '.. of selecteer een veld om te gebruiken als onderwerp'
diff --git a/lang/nl_NL.yml b/lang/nl_NL.yml
index 3b09df8..eab43fd 100644
--- a/lang/nl_NL.yml
+++ b/lang/nl_NL.yml
@@ -80,7 +80,6 @@ nl_NL:
   SilverStripe\UserForms\Model\UserDefinedForm:
     CLEARBUTTON: Herstellen
     DESCRIPTION: 'Formulier pagina'
-    EMAILADDRESS: Email
     EMAILBODY: Tekst
     EMAILFROM: Van
     EMAILSUBJECT: Onderwerp
diff --git a/lang/pl.yml b/lang/pl.yml
index b2dcdbe..64960c1 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -19,11 +19,10 @@ pl:
     TYPE: 'Rodzaj strony'
     'YES': Tak
     db_Name: Nazwa
+    db_Sort: Sortuj
     db_Title: Tytuł
   SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
     belongs_to_Group: Grupa
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    has_one_Folder: Folder
   SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
     STEP_NEXT: Następny
     STEP_PREV: Poprzedni
@@ -37,6 +36,7 @@ pl:
     RANGE_TO: do
   SilverStripe\UserForms\Model\EditableFormField\EditableOption:
     db_Name: Nazwa
+    db_Sort: Sortuj
     db_Title: Tytuł
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     RANGE_TO: do
@@ -47,7 +47,6 @@ pl:
     db_Title: Tytuł
   SilverStripe\UserForms\Model\UserDefinedForm:
     CLEARBUTTON: Wyczyść
-    EMAILADDRESS: Email
     EMAILFROM: Od
     PLURALNAME: 'Podstawowe strony'
     RECIPIENTS: Odbiorcy
diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml
index b8a985b..e93b14d 100644
--- a/lang/pl_PL.yml
+++ b/lang/pl_PL.yml
@@ -16,8 +16,8 @@ pl_PL:
     SHOWCLEARFORM: 'Pokaż przycisk Wyczyść formularz'
     SUBMISSIONS: Zgłoszenia
     SUBMITBUTTON: Wyślij
-    TEXTONCLEAR: 'Napis na przycisku ''wyczyść'':'
-    TEXTONSUBMIT: 'Napis na przycisku ''submit'':'
+    TEXTONCLEAR: "Napis na przycisku 'wyczyść':"
+    TEXTONSUBMIT: "Napis na przycisku 'submit':"
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Anuluj
     CONFIRM_FOLDER_LABEL_A: 'Pliki przesyłane przez użytkowników powinny być starannie przechowywane, aby zmniejszyć ryzyko ujawnienia poufnych danych. Upewnij się, że wybrany folder może być wyświetlany tylko przez odpowiednie strony. Uprawnieniami do folderów można zarządzać w obszarze Pliki.'
@@ -34,7 +34,7 @@ pl_PL:
     ADD_PAGE_BREAK: 'Dodaj podział strony'
     FORMFIELDS: 'Pola formularza'
   SilverStripe\UserForms\Extension\UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Wymagane pole ''{name}'' nie może być umieszczone na stronie warunkowej'
+    CONDITIONAL_REQUIRED: "Wymagane pole '{name}' nie może być umieszczone na stronie warunkowej"
     NO_PAGE: 'Pole „{name}” znalezione przed stronami'
     UNEXPECTED_BREAK: 'Nieoczekiwany podział strony „{name}” w zagnieżdżonym polu „{group}”'
     UNEXPECTED_GROUP_END: 'Znaleziono „{name}” bez pasującej grupy'
@@ -59,7 +59,6 @@ pl_PL:
     CHECKEDBYDEFAULT: 'Zaznaczenie domyślne?'
     CUSTOMERROR: 'Własny komunikat o błędzie'
     CUSTOMOPTIONS: Opcje
-    CUSTOMRULES: 'Custom Rules'
     DEFAULT: 'Domyślna wartość'
     DEFAULTTOTODAY: 'Domyślnie to dzisiaj?'
     DISPLAYIF: 'Przełącz widoczność, gdy'
@@ -73,7 +72,6 @@ pl_PL:
     MERGEFIELDNAME: 'Złącz pole'
     NAME: Nazwa
     'NO': Nie
-    PLACEHOLDER: Placeholder
     PLURALNAME: 'Edytowalne pole formularza'
     PLURALS:
       few: 'Edytowanych pól formularza {count}'
@@ -88,39 +86,31 @@ pl_PL:
     TITLE: Tytuł
     TYPE: Typ
     TYPE_EMPTY: 'Wybierz typ pola'
-    VALIDATION: Validation
     'YES': Tak
     db_Name: Nazwa
-    db_Placeholder: Placeholder
     db_RightTitle: 'Right Title'
     db_Title: Tytuł
     has_one_Parent: Rodzic
   SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
     PLURALS:
       few: 'Pól wyboru {count}'
       many: "Pól wyboru {count}\_"
       one: 'Pole wyboru'
       other: "Pola wyboru {count}\_"
-    SINGULARNAME: 'Checkbox Field'
   SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
     PLURALS:
       few: "Grup pól wyboru {count}\_"
       many: "Grup pól wyboru {count}\_"
       one: 'Grupa pól wyboru'
       other: 'Grupy pól wyboru {count}'
-    SINGULARNAME: 'Checkbox Group'
   SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
     DEFAULT: 'Domyślna wartość'
     EMPTY_STRING: 'Pusty tekst'
-    PLURALNAME: 'Country Dropdowns'
     PLURALS:
       few: 'List krajów {count}'
       many: 'List krajów {count}'
       one: 'Lista krajów'
       other: 'Lista krajów {count}'
-    SINGULARNAME: 'Country Dropdown'
     USE_EMPTY_STRING: 'Ustaw domyślny pusty tekst'
   SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
     PLURALNAME: 'Pola daty'
@@ -131,21 +121,17 @@ pl_PL:
       other: 'Pól daty {count}'
     SINGULARNAME: 'Pole daty'
   SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
     PLURALS:
       few: 'Menu rozwijanych {count}'
       many: 'Menu rozwijanych {count}'
       one: 'Menu rozwijane'
       other: 'Menu rozwijane {count}'
-    SINGULARNAME: 'Dropdown Field'
   SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
     PLURALS:
       few: 'Pola e-mail {count}'
       many: 'Pola e-mail {count}'
       one: 'Pole e-mail'
       other: 'Pola e-mail {count}'
-    SINGULARNAME: 'Email Field'
   SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup:
     PLURALNAME: 'Edytowalne grupy pól'
     PLURALS:
@@ -153,17 +139,14 @@ pl_PL:
       many: 'Edytowalne grupy pól {count}'
       one: 'Edytowalna grupa pól'
       other: 'Edytowalne grupy pól {count}'
-    SINGULARNAME: 'Editable Field Group'
   SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
     FIELD_GROUP_END: '{group} koniec'
     FIELD_GROUP_START: 'Grupa {group}'
-    PLURALNAME: 'Editable Field Group Ends'
     PLURALS:
       few: '{count} Editable Field Group Ends'
       many: '{count} Editable Field Group Ends'
       one: 'An Editable Field Group End'
       other: '{count} Editable Field Group Ends'
-    SINGULARNAME: 'Editable Field Group End'
     belongs_to_Group: Grupa
   SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
     ANYONE: 'Nieograniczony dostęp, przesłane pliki będą widoczne dla wszystkich'
@@ -200,36 +183,28 @@ pl_PL:
     STEP_TITLE: 'Strona {page}'
     TITLE_FIRST: 'Pierwsza strona'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
-    HIDEFROMREPORT: 'Hide from reports?'
     HIDELABEL: 'Ukryć etykietę „Tytuł” w interfejsie użytkownika?'
-    PLURALNAME: 'HTML Blocks'
     PLURALS:
       few: 'Bloki HTML {count}'
       many: 'Bloki HTML {count}'
       one: 'Blok HTML'
       other: 'Bloki HTML {count}'
-    SINGULARNAME: 'HTML Block'
     db_Content: Zawartość
   SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
     PLURALS:
       few: 'Pola listy członków {count}'
       many: 'Pola listy członków {count}'
       one: 'Pole listy członków'
       other: 'Pola listy członków {count}'
-    SINGULARNAME: 'Member List Field'
     has_one_Group: Grupa
   SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
     DEFAULT: 'Wybrane domyślnie?'
     OPTIONSTAB: Opcje
-    PLURALNAME: 'Editable Multiple Option Fields'
     PLURALS:
       few: 'Edytowalne pola wielu opcji {count}'
       many: 'Edytowalne pola wielu opcji {count}'
       one: 'Edytowalne pole wielu opcji'
       other: 'Edytowalne pola wielu opcji {count}'
-    SINGULARNAME: 'Editable Multiple Option Field'
     TITLE: Tytuł
     VALUE: Wartość
     has_many_Options: Opcje
@@ -308,32 +283,25 @@ pl_PL:
     SINGULARNAME: 'Stan odbiorcy wiadomości e-mail'
     has_one_Parent: Rodzic
   SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
     PLURALS:
       few: 'Przesłanych pól formularza {count}'
       many: 'Przesłanych pól formularza {count}'
       one: 'Przesłane pole formularza'
       other: 'Przesłane pola formularza {count}'
-    SINGULARNAME: 'Submitted File Field'
   SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
     PLURALS:
       few: 'Przesłane pola formularza {count}'
       many: 'Przesłane pola formularza {count}'
       one: 'Przesłane pola formularza'
       other: 'Przesłane pola formularza {count}'
-    SINGULARNAME: 'Submitted Form'
     SUBMITTER: Wysyłający
     has_one_Parent: Rodzic
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
     PLURALS:
       few: 'Przesłanych pól formularza'
       many: 'Przesłanych pól formularza {count}'
       one: 'Przesłane pole formularza'
       other: 'Przesłane pola formularza {count}'
-    SINGULARNAME: 'Submitted Form Field'
     db_Name: Nazwa
     db_Title: Tytuł
     db_Value: Wartość
@@ -346,23 +314,16 @@ pl_PL:
     DISABLEAUTHENICATEDFINISHACTION: 'Wyłącz uwierzytelnienie na koniec działania'
     DISABLECSRFSECURITYTOKEN: 'Wyłącz token CSRF'
     DISPLAYERRORMESSAGESATTOP: 'Wyświetlać komunikaty o błędach nad formularzem?'
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     EMAILTEMPLATE: 'Szablon e-mail'
     EMAIL_RECIPIENT_UNSAVED_FORM: 'Po zapisaniu tego rekordu będziesz mógł wybierać spośród prawidłowych pól formularza.'
     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.'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     HIDEINVISIBLEFIELDS: 'Ukryć niewidoczne pola przed e-mailem?'
     NORECIPIENTS: 'Ostrzeżenie: nie skonfigurowałeś żadnych odbiorców. Przesłane formularze mogą zostać pominięte.'
     ONCOMPLETELABEL: 'Pokaż po zakończeniu'
     ONCOMPLETEMESSAGE: 'Dziękujemy, otrzymaliśmy Twoje zgłoszenie.'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'Podstawowa strona'
     PLURALS:
       few: 'Zdefiniowanych formularzy {count}'
@@ -385,11 +346,9 @@ pl_PL:
     SENDIFOR: 'Któreś warunki są spełnione'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
     SHOWCLEARFORM: 'Pokaż przycisk – wyczyść formularz'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Zgłoszenia
-    SUBMITBUTTON: Submit
-    TEXTONCLEAR: 'Napis na przycisku ''wyczyść'':'
-    TEXTONSUBMIT: 'Napis na przycisku ''submit'':'
+    TEXTONCLEAR: "Napis na przycisku 'wyczyść':"
+    TEXTONSUBMIT: "Napis na przycisku 'submit':"
     TYPEREPLY: 'Podaj adres odpowiedzi'
     TYPESUBJECT: 'Podaj temat'
     TYPETO: 'Podaj adres'
diff --git a/lang/pt_PT.yml b/lang/pt_PT.yml
index 6a63cf6..1318d09 100644
--- a/lang/pt_PT.yml
+++ b/lang/pt_PT.yml
@@ -1,109 +1,22 @@
 pt_PT:
   SilverStripe\UserForms:
-    ONCOMPLETELABEL: 'Show on completion'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SUBMISSIONS: Submissions
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Texto no botão "Enviar"'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Este campo é obrigatório para este formulário e não pode ser apagado.'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
     db_Content: Conteúdo
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'Número de linhas'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
     has_one_Form: Formulário
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
-    ONCOMPLETELABEL: 'Show on completion'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
-    SUBMISSIONS: Submissions
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Texto no botão "Enviar"'
-    has_many_Submissions: Submissions
diff --git a/lang/ru.yml b/lang/ru.yml
index d1a86f1..f382d2d 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -65,7 +65,6 @@ ru:
   SilverStripe\UserForms\Model\UserDefinedForm:
     CLEARBUTTON: Сбросить
     CONFIGURATION: Конфигурация
-    EMAILADDRESS: Email
     EMAILFROM: От
     EMAILSUBJECT: 'Тема письма'
     PLURALNAME: 'Базовые страницы'
diff --git a/lang/ru_RU.yml b/lang/ru_RU.yml
index e318192..ee62ac9 100644
--- a/lang/ru_RU.yml
+++ b/lang/ru_RU.yml
@@ -1,108 +1,25 @@
 ru_RU:
   SilverStripe\UserForms:
     ONCOMPLETELABEL: 'Показать после отправки'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: Полученное
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Текст на кнопке отправки'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Это поле обязательно для этой формы и не может быть удалено'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'Кол-во строк'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
     has_one_Form: Форма
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Показать после отправки'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Полученное
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Текст на кнопке отправки'
     has_many_Submissions: Полученное
diff --git a/lang/sk.yml b/lang/sk.yml
index d4a26dd..05af52f 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -27,16 +27,14 @@ sk:
     FORMFIELDS: Formulár
     has_many_Fields: Políčka
   SilverStripe\UserForms\Extension\UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Vyžadované pole ''{name}'' nemôže byť umiestnené do podmienenej stránky'
-    NO_PAGE: 'Pole ''{name}'' nájdené pred akoukoľvek stránkou'
-    UNEXPECTED_BREAK: 'Neočakávaný zlom strany ''{name}'' vnútri obaľovacej skupiny ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' nájdený bez odpovedajúcho začiatku'
-    WRONG_GROUP_END: '''{name}'' nájdený vrámci zle uzatvorenej obaľovacej skupiny ''{group}'''
+    CONDITIONAL_REQUIRED: "Vyžadované pole '{name}' nemôže byť umiestnené do podmienenej stránky"
+    NO_PAGE: "Pole '{name}' nájdené pred akoukoľvek stránkou"
+    UNEXPECTED_BREAK: "Neočakávaný zlom strany '{name}' vnútri obaľovacej skupiny '{group}'"
+    UNEXPECTED_GROUP_END: "'{name}' nájdený bez odpovedajúcho začiatku"
+    WRONG_GROUP_END: "'{name}' nájdený vrámci zle uzatvorenej obaľovacej skupiny '{group}'"
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FILTER: Filter
     FILTERSUBMISSIONS: 'Filtrovať ...'
     FROM: Od
-    RESET: Reset
     TILL: Do
     WHEREVALUEIS: 'kde hodnota je ...'
   SilverStripe\UserForms\Model\EditableCustomRule:
@@ -120,9 +118,8 @@ sk:
     STEP_TITLE: 'Strana {page}'
     TITLE_FIRST: 'Prvá strana'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
     HIDEFROMREPORT: 'Skryť z reportu?'
-    HIDELABEL: 'Skryť ''Názov'' na FrontEnd-e?'
+    HIDELABEL: "Skryť 'Názov' na FrontEnd-e?"
     PLURALNAME: 'HTML bloky'
     SINGULARNAME: 'HTML blok'
     db_Content: Obsah
diff --git a/lang/sl.yml b/lang/sl.yml
index 112dc10..e3ca110 100644
--- a/lang/sl.yml
+++ b/lang/sl.yml
@@ -38,13 +38,12 @@ sl:
     belongs_to_SubmittedFileField: 'Polje za nalaganje datotek'
     db_UserFormUpload: 'Nalaganje uporabniškega obrazca'
   SilverStripe\UserForms\Extension\UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Obvezno polje ''{name}'' ne more biti umeščeno znotraj pogojene strani'
-    NO_PAGE: 'Polje ''{name}'' je pred katero koli stranjo'
-    UNEXPECTED_BREAK: 'Nepričakovan prelom strani ''{name}'' znotraj vgnezdenega polja ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' nima pripadajoče skupine'
-    WRONG_GROUP_END: '''{name}'' zapira napačno skupino ''{group}'''
+    CONDITIONAL_REQUIRED: "Obvezno polje '{name}' ne more biti umeščeno znotraj pogojene strani"
+    NO_PAGE: "Polje '{name}' je pred katero koli stranjo"
+    UNEXPECTED_BREAK: "Nepričakovan prelom strani '{name}' znotraj vgnezdenega polja '{group}'"
+    UNEXPECTED_GROUP_END: "'{name}' nima pripadajoče skupine"
+    WRONG_GROUP_END: "'{name}' zapira napačno skupino '{group}'"
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FILTER: Filter
     FILTERSUBMISSIONS: 'Filtriraj predložitve.'
     FROM: Od
     RESET: Ponastavi
@@ -231,9 +230,8 @@ sl:
     STEP_TITLE: 'Stran {page}'
     TITLE_FIRST: 'Prva stran'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    CONTENT: HTML
     HIDEFROMREPORT: 'Izključi iz poročil?'
-    HIDELABEL: 'Skrij oznako ''Naslov'' na frontendu?'
+    HIDELABEL: "Skrij oznako 'Naslov' na frontendu?"
     PLURALNAME: 'HTML bloki'
     PLURALS:
       few: '{count} HTML blokov'
@@ -424,8 +422,8 @@ sl:
     NORECIPIENTS: 'Opozorilo: Niste nastavili prejemnikov. Posledično bodo lahko manjkali podatki v obrazcu.'
     ONCOMPLETELABEL: 'Prikaži ob zaključku'
     ONCOMPLETEMESSAGE: 'Hvala, zabeležili smo vaš vnos.'
-    ORSELECTAFIELDTOUSEASFROM: '.. ali izberite polje, ki naj se uporabi kot ''od'''
-    ORSELECTAFIELDTOUSEASTO: '.. ali izberite polje, ki naj se uporabi kot ''za'''
+    ORSELECTAFIELDTOUSEASFROM: ".. ali izberite polje, ki naj se uporabi kot 'od'"
+    ORSELECTAFIELDTOUSEASTO: ".. ali izberite polje, ki naj se uporabi kot 'za'"
     PLURALNAME: 'Izvorne strani'
     PLURALS:
       few: '{count} izvornih strani'
@@ -437,7 +435,7 @@ sl:
     PREVIEW_EMAIL_UNAVAILABLE: 'To e-sporočilo si lahko predogledate šele ko shranite prejemnika.'
     RECIPIENTS: Prejemniki
     REPLYADDRESS: 'E-naslov za odgovor'
-    REPLYADDRESS_DESCRIPTION: 'E-naslov, na katerega lahko prejemnik ''odgovori''.'
+    REPLYADDRESS_DESCRIPTION: "E-naslov, na katerega lahko prejemnik 'odgovori'."
     RulesDescription: 'E-sporočila bodo poslana prejemnikom le, če so upoštevana prilagojena pravila. Če pravila niso določena, bo ta prejemnik prejel obvestilo za vsako oddajo.'
     SAVESUBMISSIONS: 'Onemogoči shranjevanje podatkov na strežnik'
     SELECTAFIELDTOSETSUBJECT: '.. ali izberi polje, ki naj se uporabi kot predmet'
diff --git a/lang/sr_RS.yml b/lang/sr_RS.yml
index 2e57f52..303815c 100644
--- a/lang/sr_RS.yml
+++ b/lang/sr_RS.yml
@@ -1,127 +1,46 @@
 sr_RS:
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Главно
-  SilverStripe\UserForms:
-    ONCOMPLETELABEL: 'Show on completion'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SUBMISSIONS: Submissions
-    SUBMITBUTTON: Submit
-    TEXTONSUBMIT: 'Text on submit button:'
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Одустани
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
     FILTER: Филтер
-    FROM: From
     RESET: 'Врати у пређашње стање'
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
     FIELDISREQUIRED: '{name} је обавезно'
     GROUP: Група
     NAME: Име
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Захтевано?'
-    SINGULARNAME: 'Editable Form Field'
     TITLE: Наслов
-    VALIDATION: Validation
     db_Name: Име
     db_Title: Наслов
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
   SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
     belongs_to_Group: Група
   SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
     has_one_Folder: Фасцикла
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
     db_Content: Садржај
   SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
     has_one_Group: Група
   SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
     TITLE: Наслов
-    VALUE: Value
-    has_many_Options: Options
   SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
     db_Name: Име
     db_Title: Наслов
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'Број редова'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailAddress: 'Адреса е-поште'
     db_EmailSubject: 'Email Subject'
-    has_one_Form: Form
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
     db_Name: Име
     db_Title: Наслов
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
-    ONCOMPLETELABEL: 'Show on completion'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
-    SUBMISSIONS: Submissions
-    SUBMITBUTTON: Submit
-    TEXTONSUBMIT: 'Text on submit button:'
-    has_many_Submissions: Submissions
diff --git a/lang/sv.yml b/lang/sv.yml
index 01087b0..3fc2928 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -17,7 +17,6 @@ sv:
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
     CANCEL: Avbryt
   SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FILTER: Filter
     FILTERSUBMISSIONS: 'Filtrera inskickade svar'
     FROM: Från
     RESET: Rensa
diff --git a/lang/tr_TR.yml b/lang/tr_TR.yml
index 48b11b2..6de9c11 100644
--- a/lang/tr_TR.yml
+++ b/lang/tr_TR.yml
@@ -1,108 +1,24 @@
 tr_TR:
   SilverStripe\UserForms:
     ONCOMPLETELABEL: 'Tamamlanınca görüntüle'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-    SHOWCLEARFORM: 'Show Clear Form Button'
     SUBMISSIONS: Gönderiler
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Gönder düğmesi üzerindeki yazı:'
-  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
-    FROM: From
   SilverStripe\UserForms\Model\EditableFormField:
-    CHECKEDBYDEFAULT: 'Checked by Default?'
-    CUSTOMERROR: 'Custom Error Message'
-    CUSTOMOPTIONS: Options
-    CUSTOMRULES: 'Custom Rules'
-    DEFAULTTOTODAY: 'Default to Today?'
-    GROUP: Group
-    PLURALNAME: 'Editable Form Fields'
     REQUIRED: 'Bu alan bu form için gereklidir, silinemez'
-    SINGULARNAME: 'Editable Form Field'
-    VALIDATION: Validation
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
-    belongs_to_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
-    LEVEL: 'Select Heading Level'
-    PLURALNAME: Headings
-    SINGULARNAME: Heading
-  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
-    HIDEFROMREPORT: 'Hide from reports?'
-    PLURALNAME: 'HTML Blocks'
-    SINGULARNAME: 'HTML Block'
-  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
-    PLURALNAME: 'Member List Fields'
-    SINGULARNAME: 'Member List Field'
-    has_one_Group: Group
-  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
-    OPTIONSTAB: Options
-    PLURALNAME: 'Editable Multiple Option Fields'
-    SINGULARNAME: 'Editable Multiple Option Field'
-    VALUE: Value
-    has_many_Options: Options
-  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    PLURALNAME: 'Editable Options'
-    SINGULARNAME: 'Editable Option'
-    db_Value: Value
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
     NUMBERROWS: 'Satır adedi'
-    PLURALNAME: 'Text Fields'
-    SINGULARNAME: 'Text Field'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
     db_EmailSubject: 'Email Subject'
-    has_one_Form: Form
-  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
-    DOWNLOADFILE: 'Download File'
-    PLURALNAME: 'Submitted File Fields'
-    SINGULARNAME: 'Submitted File Field'
-  SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted Forms'
-    SINGULARNAME: 'Submitted Form'
-  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
-    PLURALNAME: 'Submitted Form Fields'
-    SINGULARNAME: 'Submitted Form Field'
-    db_Value: Value
   SilverStripe\UserForms\Model\UserDefinedForm:
-    EMAILADDRESS: Email
-    EMAILBODY: Body
-    EMAILBODYHTML: Body
-    EMAILFROM: From
     EMAILSUBJECT: 'Email Subject'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'Tamamlanınca görüntüle'
-    ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-    ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
     PLURALNAME: 'User Defined Forms'
-    SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
     SENDEMAILTO: 'Send Email To'
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
-    SHOWCLEARFORM: 'Show Clear Form Button'
-    SINGULARNAME: 'User Defined Form'
     SUBMISSIONS: Gönderiler
-    SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Gönder düğmesi üzerindeki yazı:'
     has_many_Submissions: Gönderiler