diff --git a/.travis.yml b/.travis.yml
index 3d7651b..3a695d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_script:
 script:
   - vendor/bin/phpunit --coverage-clover coverage.clover userforms/tests
 
-after_script:
+after_success:
   - mv coverage.clover ~/build/$TRAVIS_REPO_SLUG/
   - cd ~/build/$TRAVIS_REPO_SLUG
   - wget https://scrutinizer-ci.com/ocular.phar
diff --git a/code/extensions/UserFormFieldEditorExtension.php b/code/extensions/UserFormFieldEditorExtension.php
index 248a68a..4645058 100644
--- a/code/extensions/UserFormFieldEditorExtension.php
+++ b/code/extensions/UserFormFieldEditorExtension.php
@@ -142,18 +142,32 @@ class UserFormFieldEditorExtension extends DataExtension
      */
     public function onAfterPublish($original)
     {
-        // Remove fields on the live table which could have been orphaned.
-        $live = Versioned::get_by_stage("EditableFormField", "Live")
-            ->filter('ParentID', $original->ID);
-
-        if ($live) {
-            foreach ($live as $field) {
-                $field->doDeleteFromStage('Live');
-            }
-        }
+        // store IDs of fields we've published
+        $seenIDs = array();
 
         foreach ($this->owner->Fields() as $field) {
+            // store any IDs of fields we publish so we don't unpublish them
+            $seenIDs[] = $field->ID;
             $field->doPublish('Stage', 'Live');
+            $field->destroy();
+        }
+
+        // fetch any orphaned live records
+        $live = Versioned::get_by_stage("EditableFormField", "Live")
+            ->filter(array(
+                'ParentID' => $original->ID,
+            ));
+
+        if (!empty($seenIDs)) {
+            $live = $live->exclude(array(
+                'ID' => $seenIDs,
+            ));
+        }
+
+        // delete orphaned records
+        foreach ($live as $field) {
+            $field->doDeleteFromStage('Live');
+            $field->destroy();
         }
     }
 
diff --git a/code/model/editableformfields/EditableFormField.php b/code/model/editableformfields/EditableFormField.php
index 1e9435a..c4f4078 100755
--- a/code/model/editableformfields/EditableFormField.php
+++ b/code/model/editableformfields/EditableFormField.php
@@ -88,7 +88,7 @@ class EditableFormField extends DataObject
         "ShowOnLoad" => "Boolean(1)", // from CustomSettings
         "ShowInSummary" => "Boolean",
     );
-    
+
     private static $defaults = array(
         'ShowOnLoad' => true,
     );
@@ -382,8 +382,8 @@ class EditableFormField extends DataObject
         if ($parent && $parent->exists()) {
             return $parent->canEdit($member) && !$this->isReadonly();
         } elseif (!$this->exists() && Controller::has_curr()) {
-            // This is for GridFieldOrderableRows support as it checks edit permissions on 
-            // singleton of the class. Allows editing of User Defined Form pages by 
+            // This is for GridFieldOrderableRows support as it checks edit permissions on
+            // singleton of the class. Allows editing of User Defined Form pages by
             // 'Content Authors' and those with permission to edit the UDF page. (ie. CanEditType/EditorGroups)
             // This is to restore User Forms 2.x backwards compatibility.
             $controller = Controller::curr();
@@ -489,11 +489,27 @@ class EditableFormField extends DataObject
     {
         $this->publish($fromStage, $toStage, $createNewVersion);
 
-        // Don't forget to publish the related custom rules...
-        foreach ($this->DisplayRules() as $rule) {
-            $rule->doPublish($fromStage, $toStage, $createNewVersion);
+		$seenIDs = array();
+
+		// Don't forget to publish the related custom rules...
+		foreach ($this->DisplayRules() as $rule) {
+			$seenIDs[] = $rule->ID;
+			$rule->doPublish($fromStage, $toStage, $createNewVersion);
+			$rule->destroy();
+		}
+
+		// remove any orphans from the "fromStage"
+        $rules = Versioned::get_by_stage('EditableCustomRule', $toStage)
+            ->filter('ParentID', $this->ID);
+
+		if (!empty($seenIDs)) {
+            $rules = $rules->exclude('ID', $seenIDs);
         }
-    }
+
+		foreach ($rules as $rule) {
+		    $rule->deleteFromStage($toStage);
+		}
+	}
 
     /**
      * Delete this field from a given stage
diff --git a/composer.json b/composer.json
index 470eb00..5ff2810 100644
--- a/composer.json
+++ b/composer.json
@@ -1,45 +1,48 @@
 {
-	"name": "silverstripe/userforms",
-	"description": "UserForms enables CMS users to create dynamic forms via a drag and drop interface and without getting involved in any PHP code",
-	"type": "silverstripe-module",
-	"keywords": ["silverstripe", "userforms"],
-	"license": "BSD-3-Clause",
-	"authors": [
-		{
-			"name": "Will Rossiter",
-			"email": "will@fullscreen.io"
-		},
-		{
-			"name": "Damian Mooyman",
-			"email": "damian@silverstripe.com"
-		},
-		{
-			"name": "David Craig",
-			"email": "david@silverstripe.com"
-		},
-		{
-			"name": "Scott Hutchinson",
-			"email": "scott@silverstripe.com"
-		},
-		{
-			"name": "Christopher Pitt",
-			"email": "chris@silverstripe.com"
-		}
-	],
-	"require": {
-		"silverstripe/framework": "~3.1",
-		"silverstripe/cms": "~3.1",
-		"silverstripe-australia/gridfieldextensions": "~1.1",
-		"silverstripe/segment-field": "^1.0"
-	},
-	"suggest": {
-		"colymba/gridfield-bulk-editing-tools": "Allows for bulk management of form submissions",
-		"silverstripe/secureassets": "Enables files uploaded via userforms to be secured from public access",
-		"silverstripe/gridfieldqueuedexport": "Export large submission as CSV through queued jobs in the background"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "5.0.x-dev"
-		}
-	}
+    "name": "silverstripe/userforms",
+    "description": "UserForms enables CMS users to create dynamic forms via a drag and drop interface and without getting involved in any PHP code",
+    "type": "silverstripe-module",
+    "keywords": [
+        "silverstripe",
+        "userforms"
+    ],
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Will Rossiter",
+            "email": "will@fullscreen.io"
+        },
+        {
+            "name": "Damian Mooyman",
+            "email": "damian@silverstripe.com"
+        },
+        {
+            "name": "David Craig",
+            "email": "david@silverstripe.com"
+        },
+        {
+            "name": "Scott Hutchinson",
+            "email": "scott@silverstripe.com"
+        },
+        {
+            "name": "Christopher Pitt",
+            "email": "chris@silverstripe.com"
+        }
+    ],
+    "require": {
+        "silverstripe/framework": "~3.1",
+        "silverstripe/cms": "~3.1",
+        "silverstripe-australia/gridfieldextensions": "~1.1",
+        "silverstripe/segment-field": "^1.0"
+    },
+    "suggest": {
+        "colymba/gridfield-bulk-editing-tools": "Allows for bulk management of form submissions",
+        "silverstripe/secureassets": "Enables files uploaded via userforms to be secured from public access",
+        "silverstripe/gridfieldqueuedexport": "Export large submission as CSV through queued jobs in the background"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "5.0.x-dev"
+        }
+    }
 }
diff --git a/javascript/lang/it.js b/javascript/lang/it.js
new file mode 100644
index 0000000..5220b2f
--- /dev/null
+++ b/javascript/lang/it.js
@@ -0,0 +1,23 @@
+// This file was generated by silverstripe/cow from javascript/lang/src/it.js.
+// See https://github.com/tractorcow/cow for details
+if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
+  if (typeof(console) !== 'undefined') { // eslint-disable-line no-console
+    console.error('Class ss.i18n not defined');  // eslint-disable-line no-console
+  }
+} else {
+  ss.i18n.addDictionary('it', {
+    "GRIDFIELD.ERRORINTRANSACTION": "Errore durante la lettura dei dati dal server.\nPer favore riprovare più tardi.",
+    "UserForms.ADDED_FIELD": "Aggiunto nuovo campo",
+    "UserForms.ADDED_OPTION": "Aggiunta opzione",
+    "UserForms.ADDING_FIELD": "In aggiunta di nuovo campo",
+    "UserForms.ADDING_OPTION": "In aggiunta di opzione",
+    "UserForms.ADDING_RULE": "In aggiunta di una regola",
+    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Tutti gli invii saranno permanentemente rimossi. Continuare?",
+    "UserForms.ERROR_CREATING_FIELD": "Errore durante la creazione del campo",
+    "UserForms.ERROR_CREATING_OPTION": "Errore durante la creazione dell'opzione",
+    "UserForms.HIDE_OPTIONS": "Nascondi opzioni",
+    "UserForms.LEAVE_CONFIRMATION": "Hai modifiche non salvate!",
+    "UserForms.REMOVED_OPTION": "Rimossa opzione",
+    "UserForms.SHOW_OPTIONS": "Mostra opzioni"
+});
+}
\ No newline at end of file
diff --git a/javascript/lang/src/it.js b/javascript/lang/src/it.js
new file mode 100644
index 0000000..e680db8
--- /dev/null
+++ b/javascript/lang/src/it.js
@@ -0,0 +1,15 @@
+{
+    "GRIDFIELD.ERRORINTRANSACTION": "Errore durante la lettura dei dati dal server.\nPer favore riprovare più tardi.",
+    "UserForms.ADDED_FIELD": "Aggiunto nuovo campo",
+    "UserForms.ADDED_OPTION": "Aggiunta opzione",
+    "UserForms.ADDING_FIELD": "In aggiunta di nuovo campo",
+    "UserForms.ADDING_OPTION": "In aggiunta di opzione",
+    "UserForms.ADDING_RULE": "In aggiunta di una regola",
+    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Tutti gli invii saranno permanentemente rimossi. Continuare?",
+    "UserForms.ERROR_CREATING_FIELD": "Errore durante la creazione del campo",
+    "UserForms.ERROR_CREATING_OPTION": "Errore durante la creazione dell'opzione",
+    "UserForms.HIDE_OPTIONS": "Nascondi opzioni",
+    "UserForms.LEAVE_CONFIRMATION": "Hai modifiche non salvate!",
+    "UserForms.REMOVED_OPTION": "Rimossa opzione",
+    "UserForms.SHOW_OPTIONS": "Mostra opzioni"
+}
\ No newline at end of file
diff --git a/lang/ar.yml b/lang/ar.yml
index eeba7a6..9cc984f 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -11,10 +11,10 @@ ar:
     NOTBLANK: 'ليس بفراغ'
     NOTVALUE: 'ليست قيمة'
     SHOWTHISFIELD: 'إظهار هذا الحقل'
-    VALUE: القيمة
-    WHEN: عندما
+    VALUE: 'القيمة'
+    WHEN: 'عندما'
   EditableCheckbox:
-    PLURALNAME: مربعات لوضع إشارة
+    PLURALNAME: 'مربعات لوضع إشارة'
     SINGULARNAME: 'حقل ذات مربع لوضع إشارة'
   EditableCheckboxGroupField:
     PLURALNAME: 'مجموعات ذات مربعات لوضع إشارة'
@@ -26,7 +26,7 @@ ar:
     PLURALNAME: 'حقول التاريخ'
     SINGULARNAME: 'حقل التاريخ'
   EditableDropdown:
-    PLURALNAME: القائمات المنسدلة للروابط
+    PLURALNAME: 'القائمات المنسدلة للروابط'
     SINGULARNAME: 'حقل القائمة المنسدلة'
   EditableEmailField:
     PLURALNAME: 'حقول البريد الإلكتروني'
@@ -51,7 +51,7 @@ ar:
     FIELDONDEFAULT: 'القيمة المبدئية للحقل'
     GREATERTHAN: 'القيمة أكبر من'
     GREATERTHANEQUAL: 'القيمة أكبر من أو تساوي'
-    GROUP: مجموعة
+    GROUP: 'مجموعة'
     HIDE: إخفاء
     HIDETHISFIELD: 'إخفاء هذا الحقل'
     IS: إنه
@@ -68,9 +68,9 @@ ar:
     SHOWOPTIONS: 'إظهار الخيارات'
     SHOWTHISFIELD: 'أعرض هذه الحقل'
     SINGULARNAME: 'حقل استمارة قابل للتحرير'
-    VALIDATION: المصادقة
-    VALUE: القيمة
-    WHEN: عندما
+    VALIDATION: 'المصادقة'
+    VALUE: 'القيمة'
+    WHEN: 'عندما'
   EditableFormHeading:
     LEVEL: 'حدد مستوى العنوان'
     PLURALNAME: عناوين
@@ -106,7 +106,7 @@ ar:
     FIELDISREQUIRED: '%s ضروري'
   GridField:
     Filter: تصفية
-    ResetFilter: إعادة تعيين
+    ResetFilter: 'إعادة تعيين'
   SiteTree:
     PLURALNAME: صفحات
     SINGULARNAME: صفحة
@@ -122,16 +122,16 @@ ar:
     SINGULARNAME: 'حقل الاستمارة الذي تمّ تقديمه'
   UserDefinedForm:
     ADDEMAILRECIPIENT: 'أضف متلقي البريد الإلكتروني'
-    CONFIGURATION: مواصفات
+    CONFIGURATION: 'مواصفات'
     DESCRIPTION: 'يضيف استمارة مخصصة.'
-    EMAILADDRESS: البريد الإلكتروني
+    EMAILADDRESS: 'البريد الإلكتروني'
     EMAILBODY: هيئة
-    EMAILFROM: من
+    EMAILFROM: 'من'
     EMAILRECIPIENTS: 'متلقي البريد الإلكتروني'
     EMAILSUBJECT: 'موضوع البريد الإلكتروني'
     ENABLELIVEVALIDATION: 'تفعيل المصادقة الآنية'
     EmailFromContent: 'عنوان خانة المرسل يسمح لك بتعيين من الذي يأتي منه البريد الالكتروني. في معظم الخوادم هذا سوف يحتاج إلى أن يعين إلى عنوان بريد إلكتروني على نفس اسم مجال موقع الويب الخاص بك. على سبيل المثال على yoursite.com عنوان خانة المرسل قد يحتاج إلى أن يكون something@yoursite.com. يمكنك مع ذلك، تعيين أي عنوان بريد إلكتروني ترغب كعنوان للرد.'
-    FORM: نموذج
+    FORM: 'نموذج'
     FROMADDRESS: 'ارسل بريد إلكتروني من'
     HIDEFIELDLABELS: 'إخفاء تسميات الحقول'
     HIDEFORMDATA: 'إخفاء بيانات النموذج من البريد الإلكتروني؟'
@@ -144,8 +144,8 @@ ar:
     SENDPLAIN: 'إرسال البريد الإلكتروني كنص عادي؟ (سيتم تجريد كود الHTML)'
     SHOWCLEARFORM: 'زر عرض النموذج ممسوحاً'
     SINGULARNAME: 'نموذج يحدده المستخدم'
-    SUBMISSIONS: التقديمات
-    SUBMITBUTTON: تقديم
+    SUBMISSIONS: 'التقديمات'
+    SUBMITBUTTON: 'تقديم'
     TEXTONSUBMIT: 'زر النص المتعلق بالتقديم:'
   UserDefinedForm_EmailRecipient:
     PLURALNAME: 'نموذج مستلمي البريد الإلكتروني يحدده المستخدم'
diff --git a/lang/ar_SA.yml b/lang/ar_SA.yml
index be73989..c78c718 100644
--- a/lang/ar_SA.yml
+++ b/lang/ar_SA.yml
@@ -24,7 +24,7 @@ ar_SA:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: حذف هذا الحقل
+    DELETE: 'حذف هذا الحقل'
     DRAG: 'أعد ترتيب الحقول بواسطة خاصية السحب و الإفلات'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
@@ -78,7 +78,7 @@ ar_SA:
     EMAILFROM: From
     EMAILRECIPIENTS: 'Email Recipients'
     EMAILSUBJECT: 'Email Subject'
-    FORM: النموذج
+    FORM: 'النموذج'
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
     ONCOMPLETELABEL: 'عرض الطلبات المكتملة'
@@ -89,7 +89,7 @@ ar_SA:
     SENDPLAIN: 'Send Email as Plain Text (HTML will be stripped)'
     SHOWCLEARFORM: 'Show Clear Form Button'
     SINGULARNAME: 'User Defined Form'
-    SUBMISSIONS: الملفات المرسلة
+    SUBMISSIONS: 'الملفات المرسلة'
     SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'النص ال'
   UserDefinedForm_EmailRecipient:
diff --git a/lang/bg_BG.yml b/lang/bg_BG.yml
index 095c171..9006a7e 100644
--- a/lang/bg_BG.yml
+++ b/lang/bg_BG.yml
@@ -24,7 +24,7 @@ bg_BG:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Изтрий това поле
+    DELETE: 'Изтрий това поле'
     DRAG: 'Плъзнете, за да подредите реда на полетата'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/da_DK.yml b/lang/da_DK.yml
index 8cef315..ffc0fbf 100644
--- a/lang/da_DK.yml
+++ b/lang/da_DK.yml
@@ -27,7 +27,7 @@ da_DK:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Slet dette felt
+    DELETE: 'Slet dette felt'
     DRAG: 'Træk for at ændre felternes rækkefølge'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/de_DE.yml b/lang/de_DE.yml
index 8957693..30eda7b 100644
--- a/lang/de_DE.yml
+++ b/lang/de_DE.yml
@@ -5,7 +5,7 @@ de_DE:
     GREATERTHAN: 'Wert größer als'
     GREATERTHANEQUAL: 'Wert größer oder gleich'
     HIDETHISFIELD: 'Feld verstecken'
-    IS: Ist gleich
+    IS: 'Ist gleich'
     LESSTHAN: 'Wert kleiner als'
     LESSTHANEQUAL: 'Wert kleiner oder gleich'
     NOTBLANK: 'Nicht leer'
@@ -23,8 +23,8 @@ de_DE:
     PLURALNAME: 'Länder Dropdowns'
     SINGULARNAME: 'Länder Dropdown'
   EditableDateField:
-    PLURALNAME: 'Datumsfelder'
-    SINGULARNAME: 'Datumsfeld'
+    PLURALNAME: Datumsfelder
+    SINGULARNAME: Datumsfeld
   EditableDropdown:
     PLURALNAME: Dropdowns
     SINGULARNAME: 'Dropdown Feld'
@@ -43,7 +43,7 @@ de_DE:
     CUSTOMERROR: 'Eigene Fehlermeldung'
     CUSTOMRULES: 'Eigene Regeln'
     DEFAULTTOTODAY: 'Standardmäßig auf heute'
-    DELETE: Lösche dieses Feld
+    DELETE: 'Lösche dieses Feld'
     DRAG: 'Klicken und Festhalten um die Anordnung der Felder zu verändern'
     ENTERQUESTION: 'Tragen Sie die Frage hier ein'
     EXTRACLASSA: 'Extra Styling/Layout'
@@ -81,8 +81,8 @@ de_DE:
     PLURALNAME: Überschriften
     SINGULARNAME: Überschrift
   EditableFormStep:
-    PLURALNAME: 'Seiten'
-    SINGULARNAME: 'Seiten'
+    PLURALNAME: Seiten
+    SINGULARNAME: Seiten
     STEP_TITLE: 'Seite {page}'
     TITLE_FIRST: 'Erste Seite'
   EditableLiteralField:
@@ -96,8 +96,8 @@ de_DE:
     PLURALNAME: 'Editierbare Multi-Option Felder'
     SINGULARNAME: 'Editierbares Multi-Option Feld'
   EditableNumericField:
-    PLURALNAME: 'Zahlenfelder'
-    SINGULARNAME: 'Zahlenfeld'
+    PLURALNAME: Zahlenfelder
+    SINGULARNAME: Zahlenfeld
   EditableOption:
     DELETE: 'Option entfernen'
     DRAG: 'Ziehen um Optionen neu zu ordnen'
@@ -105,16 +105,16 @@ de_DE:
     PLURALNAME: 'Editierbare Optionen'
     SINGULARNAME: 'Editierbare Option'
   EditableRadioField:
-    PLURALNAME: 'Radio-Buttons'
-    SINGULARNAME: 'Radio-Button'
+    PLURALNAME: Radio-Buttons
+    SINGULARNAME: Radio-Button
   EditableTextField:
     AUTOCOMPLETE: 'Automatisch vervollständigen'
     AUTOCOMPLETE_DESCRIPTION: 'Unterstützte Browser versuchen, dieses Feld automatisch mit den Benutzerinformationen zu füllen, verwenden, um den gefüllten Wert festzulegen'
     NUMBERROWS: 'Anzahl der Zeilen'
     PLACEHOLDER: Platzhalter
-    PLURALNAME: 'Textfelder'
-    SINGULARNAME: 'Textfeld'
-    TEXTLENGTH: 'Textlänge'
+    PLURALNAME: Textfelder
+    SINGULARNAME: Textfeld
+    TEXTLENGTH: Textlänge
   EditableUploadField:
     SELECTUPLOADFOLDER: 'Ordner für den Upload auswählen'
   FieldEditor:
@@ -147,7 +147,7 @@ de_DE:
     EMAILBODY: Inhalt
     EMAILFROM: Von
     EMAILRECIPIENTS: 'E-Mail Empfänger'
-    EMAILSUBJECT: 'Betreff'
+    EMAILSUBJECT: Betreff
     ENABLELIVEVALIDATION: 'Live Validierung einschalten'
     EmailFromContent: 'Mit der Absenderadresse können Sie bestimmen, von welcher Adresse aus die E-Mail versendet wird. Meistens ist es eine Adresse der selben Domain wie die Webseite. Die Webseite meineseite.com benötigt z.B. irgendwas@meineseite.com. Sie können zusätzlich jede Adresse als "Antworten an" eintragen.'
     FIELDS: Felder
@@ -176,7 +176,7 @@ de_DE:
     ADD_FIELD: 'Feld hinzufügen'
     ADD_FIELD_GROUP: 'Gruppe hinzufügen'
     ADD_PAGE_BREAK: 'Seite hinzufügen'
-    FORMFIELDS: 'Formularfelder'
+    FORMFIELDS: Formularfelder
   UserFormsGridFieldFilterHeader:
     FILTERSUBMISSIONS: 'Einreichungen filtern...'
     WHEREVALUEIS: 'nach Wert...'
diff --git a/lang/en_GB.yml b/lang/en_GB.yml
index eba74a9..0200b22 100644
--- a/lang/en_GB.yml
+++ b/lang/en_GB.yml
@@ -17,6 +17,7 @@ en_GB:
     FORM: Form
     FROMADDRESS: 'Send Email From'
     HIDEFORMDATA: 'Hide Form Data from Email'
+    NORECIPIENTS: 'Warning: You have not configured any recipients. Form submissions may be missed.'
     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'
@@ -27,7 +28,6 @@ en_GB:
     SINGULARNAME: 'User Defined Form'
     SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Text on submit button:'
-    NORECIPIENTS: 'Warning: You have not configured any recipients. Form submissions may be missed.'
   UserDefinedForm_EmailRecipient:
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
diff --git a/lang/en_US.yml b/lang/en_US.yml
index e4edda9..3c38b7e 100644
--- a/lang/en_US.yml
+++ b/lang/en_US.yml
@@ -18,6 +18,7 @@ en_US:
     FORM: Form
     FROMADDRESS: 'Send email from'
     HIDEFORMDATA: 'Hide form data from email?'
+    NORECIPIENTS: 'Warning: You have not configured any recipients. Form submissions may be missed.'
     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'
@@ -29,7 +30,6 @@ en_US:
     SINGULARNAME: 'User Defined Form'
     SUBMITBUTTON: Submit
     TEXTONSUBMIT: 'Text on submit button:'
-    NORECIPIENTS: 'Warning: You have not configured any recipients. Form submissions may be missed.'
   UserDefinedForm_EmailRecipient:
     PLURALNAME: 'User Defined Form Email Recipients'
     SINGULARNAME: 'User Defined Form Email Recipient'
diff --git a/lang/eo.yml b/lang/eo.yml
index 2b7ad45..fcb117e 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -79,7 +79,7 @@ eo:
     LOCKED: 'Ne eblas ŝanĝi ĉi tiujn kampojn'
     MAXVALUE: 'Maks valoro'
     MINVALUE: 'Min valoro'
-    'NO': 'Ne'
+    'NO': Ne
     NOTBLANK: 'Ne vaka'
     NOTVALUE: 'Ne valoro'
     OPTIONS: Agordoj
@@ -97,7 +97,7 @@ eo:
     VALIDATION: Validigo
     VALUE: Valoro
     WHEN: Kiam
-    'YES': 'Jes'
+    'YES': Jes
   EditableFormFieldValidator:
     REQUIRED_ERROR: 'Formularaj kampoj ne povas esti nepraj kaj havi kondiĉajn vidigoregulojn.'
   EditableFormHeading:
@@ -105,16 +105,16 @@ eo:
     PLURALNAME: Titoloj
     SINGULARNAME: Titolo
   EditableFormStep:
-    PLURALNAME: 'Paĝosaltoj'
-    SINGULARNAME: 'Paĝosalto'
+    PLURALNAME: Paĝosaltoj
+    SINGULARNAME: Paĝosalto
     STEP_TITLE: 'Paĝo {page}'
     TITLE_FIRST: 'Unua paĝo'
   EditableLiteralField:
     CONTENT: HTML
     HIDEFROMREPORT: 'Ĉu kaŝi de raportoj?'
     HIDELABEL: 'Ĉu kaŝi etikedon ''Titolo'' en fasado?'
-    PLURALNAME: 'HTML-blokoj'
-    SINGULARNAME: 'HTML-bloko'
+    PLURALNAME: HTML-blokoj
+    SINGULARNAME: HTML-bloko
   EditableMemberListField:
     PLURALNAME: 'Kampoj por membrolisto'
     SINGULARNAME: 'Kampo por membrolisto'
@@ -124,6 +124,7 @@ eo:
     PLURALNAME: 'Redakteblaj plureblaj kampoj'
     SINGULARNAME: 'Redaktebla plurebla kampo'
     TITLE: Titolo
+    VALUE: Valoro
   EditableNumericField:
     PLURALNAME: 'Numeraj kampoj'
     RANGE: 'Ebla numera amplekso'
@@ -192,6 +193,7 @@ eo:
     FileUploadWarning: 'Dosieroj alŝutitaj per ĉi tiu kampo eble estos alireblaj se la ĝusta URL estas sciata.'
     HIDEFIELDLABELS: 'Kaŝi kampajn etikedojn'
     HIDEFORMDATA: 'Ĉu kaŝi formularajn datumojn de retpoŝto?'
+    NORECIPIENTS: 'Averto: Vi ne agordis ricevantojn. Eble mankos sendoj de formularoj.'
     ONCOMPLETELABEL: 'Vidigi je kompletigo'
     ORSELECTAFIELDTOUSEASFROM: '.. aŭ elekti kampon uzotan kiel respondi-al-adreson'
     ORSELECTAFIELDTOUSEASTO: '.. aŭ elekti kampon uzotan kiel la al-adreson'
diff --git a/lang/es_ES.yml b/lang/es_ES.yml
index 97e30e0..3f02b83 100644
--- a/lang/es_ES.yml
+++ b/lang/es_ES.yml
@@ -14,7 +14,7 @@ es_ES:
     VALUE: Valor
     WHEN: Cuando
   EditableCheckbox:
-    PLURALNAME: Casillas de verificación
+    PLURALNAME: 'Casillas de verificación'
     SINGULARNAME: 'Campo de casillas de verificación'
   EditableCheckboxGroupField:
     PLURALNAME: 'Grupos de casillas de verificación'
@@ -29,7 +29,7 @@ es_ES:
     PLURALNAME: 'Campos de fecha'
     SINGULARNAME: 'Campo de fecha'
   EditableDropdown:
-    PLURALNAME: Listas desplegables
+    PLURALNAME: 'Listas desplegables'
   EditableEmailField:
     PLURALNAME: 'Correos electrónicos'
     SINGULARNAME: 'Campo de correo electrónico'
@@ -50,7 +50,7 @@ es_ES:
     CUSTOMOPTIONS: Opciones
     CUSTOMRULES: 'Reglas especiales'
     DEFAULTTOTODAY: '¿Por defecto a hoy?'
-    DELETE: Borrar este campo
+    DELETE: 'Borrar este campo'
     DRAG: 'Arrastre para reajustar el orden de los campos'
     ENTERQUESTION: 'Ingresar pregunta'
     EXTRACLASSA: 'Estilo/disposición adicional'
@@ -81,7 +81,7 @@ es_ES:
     VALIDATION: Validación
     VALUE: Valor
     WHEN: Cuando
-    'YES': 'Sí'
+    'YES': Sí
   EditableFormHeading:
     LEVEL: 'Selecionar el nivel del encabezado'
     PLURALNAME: Encabezados
@@ -142,7 +142,7 @@ es_ES:
     EMAILADDRESS: Email
     EMAILBODY: Cuerpo
     EMAILFROM: De
-    EMAILRECIPIENTS: 'Destinatarios'
+    EMAILRECIPIENTS: Destinatarios
     EMAILSUBJECT: 'Asunto del correo'
     ENABLELIVEVALIDATION: 'Habilitar la validación en vivo'
     EmailFromContent: 'La dirección desde permite establecer de quien viene el email. En la mayoría de los servidores esto se necesitará establecer a una dirección de email del mismo nombre de dominio que su sitio. Por ejemplo, en susitio.com la dirección desde puede ser algo como loquesea@susitio.com. Sin embargo, Ud puede establecer cualquier dirección de email que desee como dirección del remitente.'
diff --git a/lang/es_MX.yml b/lang/es_MX.yml
index 606ece0..478fb07 100644
--- a/lang/es_MX.yml
+++ b/lang/es_MX.yml
@@ -24,7 +24,7 @@ es_MX:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Eliminar este campo
+    DELETE: 'Eliminar este campo'
     DRAG: 'Arrastra para cambiar el orden de los campos'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/et_EE.yml b/lang/et_EE.yml
index 367b563..f7a9eba 100644
--- a/lang/et_EE.yml
+++ b/lang/et_EE.yml
@@ -24,7 +24,7 @@ et_EE:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Kustuta see väli
+    DELETE: 'Kustuta see väli'
     DRAG: 'Väljade ümber paigutamiseks lohistage neid'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
@@ -36,7 +36,7 @@ et_EE:
     LESSTHAN: 'Value Less Than'
     LESSTHANEQUAL: 'Value Less Than Or Equal'
     LOCKED: 'Neid väli ei saa muuta'
-    'NO': 'Ei'
+    'NO': Ei
     NOTBLANK: 'Not Blank'
     NOTVALUE: 'Not Value'
     OPTIONS: Options
@@ -47,7 +47,7 @@ et_EE:
     VALIDATION: Validation
     VALUE: Value
     WHEN: When
-    'YES': 'Jah'
+    'YES': Jah
   EditableLiteralField:
     HIDEFROMREPORT: 'Hide from reports?'
     PLURALNAME: 'HTML Blocks'
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index 5d328bc..db56b65 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -17,7 +17,7 @@ fa_IR:
     REQUIRED: 'آیا این فیلد الزامی است؟'
     RIGHTTITLE: 'عنوان سمت راست'
     TITLE: عنوان
-    'YES': 'بله'
+    'YES': بله
   EditableFormStep:
     TITLE_FIRST: 'صفحه نخست'
   EditableLiteralField:
@@ -37,7 +37,7 @@ fa_IR:
     SELECTAFIELD: 'انتخاب یک فیلد'
   GridField:
     Filter: پالایش
-    ResetFilter: از نو
+    ResetFilter: 'از نو'
   SiteTree:
     PLURALNAME: صفحات
     SINGULARNAME: صفحه
@@ -46,17 +46,17 @@ fa_IR:
   UserDefinedForm:
     CLEARBUTTON: پاک‌کردن
     DISABLECSRFSECURITYTOKEN: 'غیر فعال کردن CSRF'
-    EMAILADDRESS: ایمیل
+    EMAILADDRESS: 'ایمیل'
     EMAILFROM: از
     EMAILSUBJECT: 'موضوع پست الکترونیک'
     EMAILTEMPLATE: 'قالب پست الکترونیک'
     FIELDS: فیلدها
-    FORM: فرم
+    FORM: 'فرم'
     PLURALNAME: 'صفحه اصلی'
-    RECIPIENTS: دریافت کنندگان
+    RECIPIENTS: 'دریافت کنندگان'
     SENDEMAILTO: 'ارسال ایمیل به'
     SHOWCLEARFORM: 'نمایش دکمه خالی کردن فرم'
-    SUBMITBUTTON: ثبت کردن
+    SUBMITBUTTON: 'ثبت کردن'
     TEXTONCLEAR: 'متن روی دکمه خالی کردن فرم:'
     TEXTONSUBMIT: 'متن روی دکمه ثبت کردن:'
   UserFormFieldEditorExtension:
diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml
index 77368c1..02d1945 100644
--- a/lang/fi_FI.yml
+++ b/lang/fi_FI.yml
@@ -11,29 +11,29 @@ fi_FI:
     NOTBLANK: 'Ei ole tyhjä'
     NOTVALUE: 'Ei ole sama kuin'
     SHOWTHISFIELD: 'Näytä tämä kenttä'
-    VALUE: On sama kuin
+    VALUE: 'On sama kuin'
     WHEN: Kun
   EditableCheckbox:
     PLURALNAME: Valintaruudut
-    SINGULARNAME: 'Valintaruutukenttä'
+    SINGULARNAME: Valintaruutukenttä
   EditableCheckboxGroupField:
-    PLURALNAME: 'Valintaruutu-ryhmät'
-    SINGULARNAME: 'Valintaruutu-ryhmä'
+    PLURALNAME: Valintaruutu-ryhmät
+    SINGULARNAME: Valintaruutu-ryhmä
   EditableCountryDropdownField:
-    PLURALNAME: 'Maavalikot'
-    SINGULARNAME: 'Maavalikko'
+    PLURALNAME: Maavalikot
+    SINGULARNAME: Maavalikko
   EditableCustomRule:
     PLURALNAME: 'Muokattavat mukautetut säännöt'
     SINGULARNAME: 'Muokattava mukautettu sääntö'
   EditableDateField:
-    PLURALNAME: 'Päivämääräkentät'
-    SINGULARNAME: 'Päivämääräkenttä'
+    PLURALNAME: Päivämääräkentät
+    SINGULARNAME: Päivämääräkenttä
   EditableDropdown:
     PLURALNAME: Pudotusvalikot
-    SINGULARNAME: 'Pudotusvalikko'
+    SINGULARNAME: Pudotusvalikko
   EditableEmailField:
-    PLURALNAME: 'Sähköpostikentät'
-    SINGULARNAME: 'Sähköpostikenttä'
+    PLURALNAME: Sähköpostikentät
+    SINGULARNAME: Sähköpostikenttä
   EditableFieldGroup:
     PLURALNAME: 'Muokattavat kenttäryhmät'
     SINGULARNAME: 'Muokattava kenttäryhmä'
@@ -43,8 +43,8 @@ fi_FI:
     PLURALNAME: 'Muokattavien kenttäryhmien loppu'
     SINGULARNAME: 'Muokattavan kenttäryhmän loppu'
   EditableFileField:
-    PLURALNAME: 'Tiedostonlähettämiskentät'
-    SINGULARNAME: 'Tiedostonlähettämiskenttä'
+    PLURALNAME: Tiedostonlähettämiskentät
+    SINGULARNAME: Tiedostonlähettämiskenttä
   EditableFormField:
     ADD: Lisää
     ADDLabel: 'Lisää valinta'
@@ -54,7 +54,7 @@ fi_FI:
     CUSTOMERROR: 'Oma virheviesti'
     CUSTOMOPTIONS: Valinnat
     CUSTOMRULES: 'Mukautetut säännöt'
-    DEFAULT: 'Oletusarvo'
+    DEFAULT: Oletusarvo
     DEFAULTTOTODAY: 'Oletus ''Tänään''?'
     DELETE: Poista
     DISPLAY_RULES_DISABLED: 'Näyttösäännöt ei ole päällä vaadituille kentille. Ole hyvä ja poista valinta "Onko tämä kenttä pakollinen?" kohdasta "Validointi" kytkeäksesi ne päälle.'
@@ -77,9 +77,9 @@ fi_FI:
     LESSTHAN: 'Arvo on pienempi kuin'
     LESSTHANEQUAL: 'Arvo on pienempi tai yhtä suuri kuin'
     LOCKED: 'Näitä kenttiä ei voida muokata'
-    MAXVALUE: 'Maksimiarvo'
-    MINVALUE: 'Minimiarvo'
-    'NO': 'Ei'
+    MAXVALUE: Maksimiarvo
+    MINVALUE: Minimiarvo
+    'NO': Ei
     NOTBLANK: 'Ei ole tyhjä'
     NOTVALUE: 'Ei ole sama kuin'
     OPTIONS: Valinnat
@@ -95,9 +95,9 @@ fi_FI:
     TITLE: Otsikko
     TYPE: Tyyppi
     VALIDATION: Validointi
-    VALUE: On sama kuin
+    VALUE: 'On sama kuin'
     WHEN: Kun
-    'YES': 'Kyllä'
+    'YES': Kyllä
   EditableFormFieldValidator:
     REQUIRED_ERROR: 'Lomakekentät eivät voi olla pakollisia ja sisältää ehdollisia näyttösääntöjä'
   EditableFormHeading:
@@ -105,25 +105,26 @@ fi_FI:
     PLURALNAME: Otsikot
     SINGULARNAME: Otsikko
   EditableFormStep:
-    PLURALNAME: 'Sivuvaihdot'
-    SINGULARNAME: 'Sivunvaihto'
+    PLURALNAME: Sivuvaihdot
+    SINGULARNAME: Sivunvaihto
     STEP_TITLE: 'Sivu {page}'
     TITLE_FIRST: 'Ensimmäinen sivu'
   EditableLiteralField:
     CONTENT: HTML
     HIDEFROMREPORT: 'Piilota raporteista?'
     HIDELABEL: 'Piilota ''Otsikko'' näytettävältä lomakkeelta?'
-    PLURALNAME: 'HTML-alueet'
-    SINGULARNAME: 'HTML-alue'
+    PLURALNAME: HTML-alueet
+    SINGULARNAME: HTML-alue
   EditableMemberListField:
-    PLURALNAME: 'Jäsenlistakentät'
-    SINGULARNAME: 'Jäsenlistakenttä'
+    PLURALNAME: Jäsenlistakentät
+    SINGULARNAME: Jäsenlistakenttä
   EditableMultipleOptionField:
     DEFAULT: 'Valittu oletuksena?'
     OPTIONSTAB: Valinnat
     PLURALNAME: 'Muokattavat monivalintakentät'
     SINGULARNAME: 'Muokattava monivalintakenttä'
     TITLE: Otsikko
+    VALUE: Arvo
   EditableNumericField:
     PLURALNAME: 'Numeeriset kentät'
     RANGE: 'Sallittu numeerinen väli'
@@ -136,15 +137,15 @@ fi_FI:
     PLURALNAME: 'Muokattavat vaihtoehdot'
     SINGULARNAME: 'Muokattava vaihtoehto'
   EditableRadioField:
-    PLURALNAME: 'Radiopainikkeet'
-    SINGULARNAME: 'Radiopainike'
+    PLURALNAME: Radiopainikkeet
+    SINGULARNAME: Radiopainike
   EditableTextField:
     NUMBERROWS: 'Rivien määrä'
     NUMBERROWS_DESCRIPTION: 'Kenttät, joissa on enemmän kuin yksi rivi, luodaan tekstialueena.'
     PLACEHOLDER: Opastusteksti
-    PLURALNAME: 'Tekstikentät'
+    PLURALNAME: Tekstikentät
     RANGE_TO: –
-    SINGULARNAME: 'Tekstikenttä'
+    SINGULARNAME: Tekstikenttä
     TEXTLENGTH: 'Tekstin pituus'
   EditableUploadField:
     SELECTUPLOADFOLDER: 'Valitse siirtokansio'
@@ -181,9 +182,9 @@ fi_FI:
     EMAILBODY: Viesti
     EMAILBODYHTML: Viesti
     EMAILFROM: Lähettäjä
-    EMAILRECIPIENTS: 'Vastaanottajat'
-    EMAILSUBJECT: 'Otsikko'
-    EMAILTEMPLATE: 'Sähköpostipohja'
+    EMAILRECIPIENTS: Vastaanottajat
+    EMAILSUBJECT: Otsikko
+    EMAILTEMPLATE: Sähköpostipohja
     ENABLELIVEVALIDATION: 'Aktivoi reaaliaikainen validointi'
     EmailFromContent: 'Lähettäjän sähköpostiosoite kenttään voit laittaa osoitteen, josta lomake näkyy lähetetyn. Jotkut palvelimet vaativat, että osoitteen on oltava samalla domain päätteellä kuin sivustosi. Esimerkiksi omasivusto.fi domainilla osoitteen tulisi olla osoitteesi@omasivusto.fi. Voit käyttää kuitenkin haluamaasi osoitetta, jos sille ei ole teknistä estettä.'
     FIELDS: Kentät
@@ -192,27 +193,28 @@ fi_FI:
     FileUploadWarning: 'Tällä kentällä lähetetyt tiedostot ovat avattavissa julkisesti, mikäli tarkka verkko-osoite on käyttäjän tiedossa.'
     HIDEFIELDLABELS: 'Piilota kenttien nimikkeet'
     HIDEFORMDATA: 'Piilota lomakedata sähköpostista'
+    NORECIPIENTS: 'Varoitus: et ole lisännyt yhtään vastaanottajaa. Lähetetyt lomakkeet voivat jäädä näkemättä.'
     ONCOMPLETELABEL: 'Näytä valmistuessa'
     ORSELECTAFIELDTOUSEASFROM: '.. tai valitse kenttä, jota käytetään Reply To -osoitteena'
     ORSELECTAFIELDTOUSEASTO: '.. tai valitse kenttä, jota käytetään vastaanottajan osoitteena'
-    PLURALNAME: 'Pohjasivut'
+    PLURALNAME: Pohjasivut
     PREVIEW_EMAIL: 'Esikatsele sähköposti'
     PREVIEW_EMAIL_DESCRIPTION: 'Huomio: tallentamattomat muutokset eivät näy esikatselussa.'
     PREVIEW_EMAIL_UNAVAILABLE: 'Voit esikatsella tämän sähköpostin, kunhan olet tallentanut Vastaanottajan.'
     RECIPIENTS: Vastaanottajat
-    REPLYADDRESS: 'Vastaussähköposti'
+    REPLYADDRESS: Vastaussähköposti
     REPLYADDRESS_DESCRIPTION: 'Sähköpostiosoite, johon vastaanottajalla on mahdollisuus vastata.'
     RulesDescription: 'Sähköpostit lähetetään vastaanottajalle vain, mikäli kustomoidut säännöt toteutuvat. Mikäli ehdot eivät toteudu, vastaanottaja saa huomautuksen jokaisesta lähetyksestä.'
     SAVESUBMISSIONS: 'Poista lomakkeen tallennus tietokantaan (lähetys vain sähköpostiin)'
     SELECTAFIELDTOSETSUBJECT: '... tai valitse kenttä, jota käytetään Aiheena'
     SENDEMAILTO: 'Lähetä sähköposti osoitteeseen'
     SENDEMAILTO_DESCRIPTION: 'Voit lisätä useamman osoitteen pilkulla erotettuna listana'
-    SENDIF: 'Lähetyssääntö'
+    SENDIF: Lähetyssääntö
     SENDIFAND: 'Kaikki ehdot ovat tosia'
     SENDIFOR: 'Kaikki ehdot ovat tosia'
     SENDPLAIN: 'Lähetä sähköposti puhtaassa tekstimuodossa (HTML-muotoilu poistetaan)'
     SHOWCLEARFORM: 'Näytä lomakkeentyhjennysnappi'
-    SINGULARNAME: 'Lomake'
+    SINGULARNAME: Lomake
     SUBMISSIONS: Lähetykset
     SUBMITBUTTON: Lähetä
     TEXTONCLEAR: 'Tyhjennä-nappulan teksti:'
@@ -233,7 +235,7 @@ fi_FI:
     ADD_FIELD: 'Lisää kenttä'
     ADD_FIELD_GROUP: 'Lisää kenttäryhmä'
     ADD_PAGE_BREAK: 'Lisää sivunvaihto'
-    FORMFIELDS: 'Lomakekentät'
+    FORMFIELDS: Lomakekentät
   UserFormValidator:
     CONDITIONAL_REQUIRED: 'Pakollista kenttää ''{name}'' ei voida sijoittaa ehdolliseen sivuun'
     NO_PAGE: 'Kenttä ''{name}'' löydetty ennen yhtään sivua'
diff --git a/lang/fr_FR.yml b/lang/fr_FR.yml
index 91d9825..acf4a45 100644
--- a/lang/fr_FR.yml
+++ b/lang/fr_FR.yml
@@ -24,7 +24,7 @@ fr_FR:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Supprimer ce champ
+    DELETE: 'Supprimer ce champ'
     DRAG: 'Glisser pour arranger l''ordre des champs'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/hr_HR.yml b/lang/hr_HR.yml
index 9dd849b..61d414a 100644
--- a/lang/hr_HR.yml
+++ b/lang/hr_HR.yml
@@ -36,7 +36,7 @@ hr_HR:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Obriši ovo polje
+    DELETE: 'Obriši ovo polje'
     DRAG: 'Povuci za promjenu redoslijeda polja'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/it.yml b/lang/it.yml
index b476b12..a6e9c4c 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -5,11 +5,11 @@ it:
     GREATERTHAN: 'Valore più elevato di'
     GREATERTHANEQUAL: 'Valore più elevato o uguale a'
     HIDETHISFIELD: 'Nascondi questo campo'
-    IS: "È"
+    IS: è
     LESSTHAN: 'Valore minore di'
     LESSTHANEQUAL: 'Valore minore o uguale a'
     NOTBLANK: 'Non vuoto'
-    NOTVALUE: 'Non valore'
+    NOTVALUE: 'Non valorizzato'
     SHOWTHISFIELD: 'Mostra questo campo'
     VALUE: Valore
     WHEN: Quando
@@ -57,14 +57,14 @@ it:
     DEFAULT: 'Valore di default'
     DEFAULTTOTODAY: 'Di default a oggi?'
     DELETE: Elimina
-    DISPLAY_RULES_DISABLED: 'Le regole di visualizzazione non sono attivate per i campi richiesti. Per piacere deseleziona "Questo campo è obbligatorio?" sotto "Validazione" per ri-abilitare.'
-    DRAG: "Trascina per riordinare l'ordine dei campi"
+    DISPLAY_RULES_DISABLED: 'Le regole di visualizzazione non sono attivate per i campi richiesti. Per piacere deseleziona "Questo campo è obbligatorio?" sotto "Validazione" per riabilitarle.'
+    DRAG: 'Trascina per riordinare l''ordine dei campi'
     ENTERQUESTION: 'Inserisci la domanda'
-    EXTRACLASSA: 'Style/Layout extra'
+    EXTRACLASSA: 'Stile/Layout extra'
     EXTRACLASSB: 'Classe CSS extra - separa valori multipli con uno spazio'
     EXTRACLASS_MULTIPLE: 'Separa ogni classe CSS con uno spazio singolo'
     EXTRACLASS_SELECT: 'Seleziona da una lista di stili consentiti'
-    EXTRACLASS_TITLE: 'Style/Layout extra'
+    EXTRACLASS_TITLE: 'Stile/Layout extra'
     EXTRACLASS_Title: 'Classi CSS extra'
     FIELDCONFIGURATION: 'Configurazione campo'
     FIELDONDEFAULT: 'Campo su default'
@@ -73,7 +73,7 @@ it:
     GROUP: Gruppo
     HIDE: Nascondi
     HIDETHISFIELD: 'Nascondi questo campo'
-    IS: "È"
+    IS: è
     LESSTHAN: 'Valore minore di'
     LESSTHANEQUAL: 'Valore minore di o uguale a'
     LOCKED: 'Questi campi non possono essere modificati'
@@ -97,9 +97,9 @@ it:
     VALIDATION: Validazione
     VALUE: Valore
     WHEN: Quando
-    'YES': 'Si'
+    'YES': Si
   EditableFormFieldValidator:
-    REQUIRED_ERROR: 'I campi dei form non possono essere obblicatori e avere regole di visualizzazione condizionali.'
+    REQUIRED_ERROR: 'I campi dei form non possono essere obbligatori e avere regole di visualizzazione condizionali.'
   EditableFormHeading:
     LEVEL: 'Seleziona livello di intestazione'
     PLURALNAME: Intestazioni
@@ -132,7 +132,7 @@ it:
     SINGULARNAME: 'Campo numerico'
   EditableOption:
     DELETE: 'Rimuovi questa opzione'
-    DRAG: "Trascina per modificare l'ordine delle opzioni"
+    DRAG: 'Trascina per modificare l''ordine delle opzioni'
     LOCKED: 'Questi campi non possono essere modificati'
     PLURALNAME: 'Opzioni modificabili'
     SINGULARNAME: 'Opzione modificabile'
@@ -168,16 +168,16 @@ it:
     SINGULARNAME: 'Campo file inviati'
   SubmittedForm:
     PLURALNAME: 'Moduli inviati'
-    SINGULARNAME: 'Modulo inviati'
+    SINGULARNAME: 'Modulo inviato'
   SubmittedFormField:
-    PLURALNAME: 'Campi modulo inviati'
-    SINGULARNAME: 'Campo modulo inviati'
+    PLURALNAME: 'Campi moduli inviati'
+    SINGULARNAME: 'Campo modulo inviato'
   UserDefinedForm:
     ADDEMAILRECIPIENT: 'Aggiungi destinatario e-mail'
     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
@@ -188,51 +188,51 @@ 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.'
     FIELDS: Campi
     FORM: Modulo
     FROMADDRESS: 'Manda e-mail da'
     FileUploadWarning: 'I files caricati attraverso questo campo potrebbero essere pubblicamente accessibili se si conosce la loro URL esatta'
     HIDEFIELDLABELS: 'Nascondi etichette dei campi'
-    HIDEFORMDATA: "Nascondi dati del modulo dall'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'
-    SENDEMAILTO: 'Manda email a'
+    SENDEMAILTO: 'Manda e-mail a'
     SENDEMAILTO_DESCRIPTION: 'Puoi inserire più indirizzi email sotto forma di lista separata da virgole.'
     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'
   UserDefinedForm_EmailRecipient:
     CUSTOMRULESTAB: 'Regole personalizzate'
-    EMAILCONTENTTAB: "Contenuto dell'e-mail"
-    EMAILDETAILSTAB: "Dettagli dell'e-mail"
-    PLURALNAME: "Destinatari email del modulo definito dall'utente"
-    SINGULARNAME: "Destinatario emaail del form 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'
   UserDefinedForm_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'
   UserFormFieldEditorExtension:
     ADD_FIELD: 'Aggiungi campo'
     ADD_FIELD_GROUP: 'Aggiungi gruppo di campi'
diff --git a/lang/ja.yml b/lang/ja.yml
index 54fcfb5..73468c4 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -1,29 +1,29 @@
 ja:
   EditableEmailField:
-    PLURALNAME: 'メールフィールド'
-    SINGULARNAME: 'メールフィールド'
+    PLURALNAME: メールフィールド
+    SINGULARNAME: メールフィールド
   EditableLiteralField:
     HIDEFROMREPORT: 'レポートから隠しますか?'
-    PLURALNAME: 'HTMLブロック'
-    SINGULARNAME: 'HTMLブロック'
+    PLURALNAME: HTMLブロック
+    SINGULARNAME: HTMLブロック
   EditableMultipleOptionField:
-    PLURALNAME: '編集可能なマルチオプションフィールド'
-    SINGULARNAME: '編集可能なマルチオプションフィールド'
+    PLURALNAME: 編集可能なマルチオプションフィールド
+    SINGULARNAME: 編集可能なマルチオプションフィールド
   UserDefinedForm:
     EMAILADDRESS: メール
     EMAILBODY: ボディ
-    EMAILFROM: 送信者
-    EMAILSUBJECT: 'メールの件名'
+    EMAILFROM: '送信者'
+    EMAILSUBJECT: メールの件名
     EmailFromContent: '送信元アドレスでどこからメールを送信するのか設定することができます。多くのサーバーではこれはあなたのサイトのドメイン名と同じメールアドレスに設定する必要があります。たとえば yoursite.com では送信元アドレスは something@yoursite.com としなければいけません。ただし、返信先アドレスは好きなメールアドレスを設定することができます。'
-    FORM: フォーム
+    FORM: 'フォーム'
     FROMADDRESS: 'メールの送信元'
     HIDEFORMDATA: 'メールからフォームデータを見えないようにしますか?'
-    ONCOMPLETELABEL: '完成時に表示'
+    ONCOMPLETELABEL: 完成時に表示
     ORSELECTAFIELDTOUSEASFROM: '..またはフィールドを選択して返信先アドレスとして使用'
     ORSELECTAFIELDTOUSEASTO: '..またはフィールドを選択して宛先アドレスとして使用'
-    REPLYADDRESS: '以下への返信メール'
-    SAVESUBMISSIONS: '提出物をサーバーに保存するのを無効化'
-    SENDEMAILTO: 'メールを送信'
+    REPLYADDRESS: 以下への返信メール
+    SAVESUBMISSIONS: 提出物をサーバーに保存するのを無効化
+    SENDEMAILTO: メールを送信
     SENDPLAIN: 'プレーンテキストとしてメールを送信しますか? (HTMLは取り除かれます)'
     SHOWCLEARFORM: 'フォームをクリアーボタンを表示する'
     SINGULARNAME: 'ユーザー定義フォーム'
diff --git a/lang/mi.yml b/lang/mi.yml
index d1438f6..ec28ed3 100644
--- a/lang/mi.yml
+++ b/lang/mi.yml
@@ -5,7 +5,7 @@ mi:
     GREATERTHAN: 'Uara Nui Ake I'
     GREATERTHANEQUAL: 'Uara Nui Ake Ōrite Rānei '
     HIDETHISFIELD: 'Hunaia Tēnei Āpure'
-    IS: ko te
+    IS: 'ko te'
     LESSTHAN: 'Uara Iti Iho I'
     LESSTHANEQUAL: 'Uara Iti Iho Ōrite Rānei'
     NOTBLANK: 'Pātea Kore'
@@ -14,7 +14,7 @@ mi:
     VALUE: Uara
     WHEN: Ina
   EditableCheckbox:
-    PLURALNAME: Ngā Pouakataki
+    PLURALNAME: 'Ngā Pouakataki'
     SINGULARNAME: 'Āpure Pouakataki'
   EditableCheckboxGroupField:
     PLURALNAME: 'Ngā Rōpū Pouakataki'
@@ -26,7 +26,7 @@ mi:
     PLURALNAME: 'Ngā Āpure Rā'
     SINGULARNAME: 'Āpure Rā'
   EditableDropdown:
-    PLURALNAME: Ngā Takaiho
+    PLURALNAME: 'Ngā Takaiho'
     SINGULARNAME: 'Āpure Takaiho'
   EditableEmailField:
     PLURALNAME: 'Ngā Āpure Īmēra'
@@ -54,13 +54,13 @@ mi:
     GROUP: Rōpū
     HIDE: Huna
     HIDETHISFIELD: 'Hunaia Tēnei Āpure'
-    IS: Ko te
+    IS: 'Ko te'
     LESSTHAN: 'Uara Iti Iho I'
     LESSTHANEQUAL: 'Uara Iti Iho Ōrite Rānei'
     LOCKED: 'Kāore e taea te whakakē ēnei āpure'
     NOTBLANK: 'Pātea Kore'
     NOTVALUE: 'Uara Kore'
-    OPTIONS: Ngā Kōwhiringa
+    OPTIONS: 'Ngā Kōwhiringa'
     PLURALNAME: 'Ngā Āpure Puka Ka Taea Te Whakatika'
     REQUIRED: 'He Whakaritenga tēnei āpure'
     RIGHTTITLE: 'Taitara Tika'
@@ -73,7 +73,7 @@ mi:
     WHEN: Ina
   EditableFormHeading:
     LEVEL: 'Kōwhiri Taumata Pane'
-    PLURALNAME: Ngā Pane
+    PLURALNAME: 'Ngā Pane'
     SINGULARNAME: Pane
   EditableLiteralField:
     HIDEFROMREPORT: 'Hunaia i ngā pūrongo?'
@@ -106,9 +106,9 @@ mi:
     FIELDISREQUIRED: 'Kei te hiahiatia te %s'
   GridField:
     Filter: Tātari
-    ResetFilter: Tautuhi Anō
+    ResetFilter: 'Tautuhi Anō'
   SiteTree:
-    PLURALNAME: Ngā Whārangi
+    PLURALNAME: 'Ngā Whārangi'
     SINGULARNAME: Whārangi
   SubmittedFileField:
     DOWNLOADFILE: 'Tikiake Kōnae'
@@ -144,7 +144,7 @@ mi:
     SENDPLAIN: 'Tuku īmēra hei kuputuhi tōkau? (ka tangohia te HTML)'
     SHOWCLEARFORM: 'Whakaatu Pātene Ūkui Puka'
     SINGULARNAME: 'Puka Tautuhi ā-Kaiwhakamahi'
-    SUBMISSIONS: Ngā Tukunga
+    SUBMISSIONS: 'Ngā Tukunga'
     SUBMITBUTTON: Tuku
     TEXTONSUBMIT: 'Kuputuhi i te pātene tuku:'
   UserDefinedForm_EmailRecipient:
diff --git a/lang/ms_MY.yml b/lang/ms_MY.yml
index 9fb087f..e27bbeb 100644
--- a/lang/ms_MY.yml
+++ b/lang/ms_MY.yml
@@ -24,7 +24,7 @@ ms_MY:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Hapuskan medan ini
+    DELETE: 'Hapuskan medan ini'
     DRAG: 'Seret untuk mengubah susunan medan-medan'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/nb_NO.yml b/lang/nb_NO.yml
index 1c0e0e9..fe96b57 100644
--- a/lang/nb_NO.yml
+++ b/lang/nb_NO.yml
@@ -23,8 +23,8 @@ nb_NO:
     PLURALNAME: 'Land nedfellsmenyer'
     SINGULARNAME: 'Land nedfellsmeny'
   EditableDateField:
-    PLURALNAME: 'Datofelter'
-    SINGULARNAME: 'Datofelt'
+    PLURALNAME: Datofelter
+    SINGULARNAME: Datofelt
   EditableDropdown:
     PLURALNAME: Nedfellsmeny
     SINGULARNAME: 'Nedfellsmeny felt'
@@ -32,10 +32,10 @@ nb_NO:
     PLURALNAME: 'Epost felt'
     SINGULARNAME: 'Epost felt'
   EditableFileField:
-    PLURALNAME: 'Filopplastingsfelter'
-    SINGULARNAME: 'Filopplastingsfelt'
+    PLURALNAME: Filopplastingsfelter
+    SINGULARNAME: Filopplastingsfelt
   EditableFormField:
-    ADD: Legg til
+    ADD: 'Legg til'
     ADDLabel: 'Legt til alternativ'
     ADDRULE: 'Legg til regel'
     BLANK: Blank
@@ -93,15 +93,15 @@ nb_NO:
     PLURALNAME: 'Redigerbart alternativer'
     SINGULARNAME: 'Redigerbart alternativ'
   EditableRadioField:
-    PLURALNAME: 'Radiofelt'
-    SINGULARNAME: 'Radiofelt'
+    PLURALNAME: Radiofelt
+    SINGULARNAME: Radiofelt
   EditableTextField:
     NUMBERROWS: 'Antall rader'
-    PLURALNAME: 'Tekstfelt'
-    SINGULARNAME: 'Tekstfelt'
+    PLURALNAME: Tekstfelt
+    SINGULARNAME: Tekstfelt
     TEXTLENGTH: 'Tekst lengde'
   FieldEditor:
-    ADD: Legg til
+    ADD: 'Legg til'
     SELECTAFIELD: 'Velg et felt'
   Form:
     FIELDISREQUIRED: '%er er påkrevd'
diff --git a/lang/nl_NL.yml b/lang/nl_NL.yml
index b34073d..ce8e29b 100644
--- a/lang/nl_NL.yml
+++ b/lang/nl_NL.yml
@@ -15,7 +15,7 @@ nl_NL:
     WHEN: Wanneer
   EditableCheckbox:
     PLURALNAME: Selectievakjes
-    SINGULARNAME: 'Selectievakje'
+    SINGULARNAME: Selectievakje
   EditableCheckboxGroupField:
     PLURALNAME: 'Groepen van selectievakjes'
     SINGULARNAME: 'Groep van selectievakje'
@@ -23,8 +23,8 @@ nl_NL:
     PLURALNAME: 'Vervolgkeuzelijsten van landen'
     SINGULARNAME: 'Vervolgkeuzelijst van landen'
   EditableDateField:
-    PLURALNAME: 'Datumvelden'
-    SINGULARNAME: 'Datumveld'
+    PLURALNAME: Datumvelden
+    SINGULARNAME: Datumveld
   EditableDropdown:
     PLURALNAME: Vervolgkeuzelijsten
     SINGULARNAME: 'Vervolgkeuzelijst veld'
@@ -135,7 +135,7 @@ nl_NL:
     EMAILBODY: Tekst
     EMAILFROM: Van
     EMAILRECIPIENTS: 'Email ontvangers'
-    EMAILSUBJECT: 'Onderwerp'
+    EMAILSUBJECT: Onderwerp
     ENABLELIVEVALIDATION: 'Zet real-time validatie aan'
     EmailFromContent: 'Met het vanaf adres kunt u instellen waar het ingediende formulier vandaag komt. Op de meeste servers dien je een email in te vullen van hetzelfde domein als deze website. Bijvoorbeeld op jouwwebsite.nl dan dien je het volgende adres in te stellen iets@jouwwebsite.nl. Echter kunt u bij antwoorden op ieder email adres invullen.'
     FORM: Formulier
diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml
index 42679d5..93ddae1 100644
--- a/lang/pl_PL.yml
+++ b/lang/pl_PL.yml
@@ -43,7 +43,7 @@ pl_PL:
     CUSTOMERROR: 'Własny komunikat o błędzie'
     CUSTOMRULES: 'Custom Rules'
     DEFAULTTOTODAY: 'Domyślnie to dzisiaj?'
-    DELETE: Usuń to pole
+    DELETE: 'Usuń to pole'
     DRAG: 'Przeciągnij aby zmienić kolejność pól'
     ENTERQUESTION: 'Wpisz pytanie'
     EXTRACLASSA: 'Dodatkowy styl / layout'
@@ -61,7 +61,7 @@ pl_PL:
     LOCKED: 'Te pola nie mogą być modyfikowane'
     MAXVALUE: 'Wartość max'
     MINVALUE: 'Wartość min'
-    'NO': 'Nie'
+    'NO': Nie
     NOTBLANK: 'Not Blank'
     NOTVALUE: 'Not Value'
     OPTIONS: Options
@@ -75,7 +75,7 @@ pl_PL:
     VALIDATION: Validation
     VALUE: Value
     WHEN: When
-    'YES': 'Tak'
+    'YES': Tak
   EditableFormHeading:
     LEVEL: 'Wybierzpoziom nagłówka'
     PLURALNAME: Nagłówki
diff --git a/lang/pt_PT.yml b/lang/pt_PT.yml
index bc2658e..b9a89b3 100644
--- a/lang/pt_PT.yml
+++ b/lang/pt_PT.yml
@@ -24,7 +24,7 @@ pt_PT:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Apagar este campo
+    DELETE: 'Apagar este campo'
     DRAG: 'Arraste para reordenar os campos'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/ru_RU.yml b/lang/ru_RU.yml
index 574e230..2fa14d7 100644
--- a/lang/ru_RU.yml
+++ b/lang/ru_RU.yml
@@ -24,7 +24,7 @@ ru_RU:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Удалить это поле
+    DELETE: 'Удалить это поле'
     DRAG: 'Перетащите для изменения порядка полей'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/sk.yml b/lang/sk.yml
index ec4e85a..d42a955 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -8,13 +8,13 @@ sk:
     IS: je/má
     LESSTHAN: 'Hodnotu menšiu ako'
     LESSTHANEQUAL: 'Hodnotu menšiu alebo rovnú ako'
-    NOTBLANK: 'Vyplnené'
+    NOTBLANK: Vyplnené
     NOTVALUE: 'Nie zadanú hodnotu'
     SHOWTHISFIELD: 'Zobraziť toto pole'
-    VALUE: Zadanú hodnotu
-    WHEN: ak pole
+    VALUE: 'Zadanú hodnotu'
+    WHEN: 'ak pole'
   EditableCheckbox:
-    PLURALNAME: Zaškrtávacie polia (checkbox)
+    PLURALNAME: 'Zaškrtávacie polia (checkbox)'
     SINGULARNAME: 'Zaškrtávacie pole (checkbox)'
   EditableCheckboxGroupField:
     PLURALNAME: 'Skupiny zaškrtávacích polí'
@@ -29,7 +29,7 @@ sk:
     PLURALNAME: 'Dátumové polia'
     SINGULARNAME: 'Dátumové pole'
   EditableDropdown:
-    PLURALNAME: Rozbaľovacie polia
+    PLURALNAME: 'Rozbaľovacie polia'
     SINGULARNAME: 'Rozbaľovacie pole'
   EditableEmailField:
     PLURALNAME: 'E-mailové polia'
@@ -79,7 +79,7 @@ sk:
     MAXVALUE: 'Maximálna hodnota'
     MINVALUE: 'Minimálna hodnota'
     'NO': ' Nie'
-    NOTBLANK: 'Vyplnené'
+    NOTBLANK: Vyplnené
     NOTVALUE: 'Nie zadanú hodnotu'
     OPTIONS: Voľba/možnosť
     PLURALNAME: 'Formulárové polia'
@@ -94,9 +94,9 @@ sk:
     TITLE: Titulok
     TYPE: Typ
     VALIDATION: Validácia
-    VALUE: Zadanú hodnotu
-    WHEN: ak pole
-    'YES': 'Áno'
+    VALUE: 'Zadanú hodnotu'
+    WHEN: 'ak pole'
+    'YES': Áno
   EditableFormFieldValidator:
     REQUIRED_ERROR: 'Formulárové polia nemôžu byť vyžadované, ak majú podmienené pravidlá zobrazenia.'
   EditableFormHeading:
@@ -130,15 +130,15 @@ sk:
     DELETE: 'Odstráň túto možnosť'
     DRAG: 'Ťahaním preskupiť poradie polí'
     LOCKED: 'Tieto polia nie je možné meniť'
-    PLURALNAME: 'Možnosti'
-    SINGULARNAME: 'Možnosť'
+    PLURALNAME: Možnosti
+    SINGULARNAME: Možnosť
   EditableRadioField:
     PLURALNAME: 'Prepínacie polia (radio)'
     SINGULARNAME: 'Prepínacie pole (radio)'
   EditableTextField:
     NUMBERROWS: 'Počet riadkov'
     NUMBERROWS_DESCRIPTION: 'Políčka s viac ako jedným riadkom sú generované ako textarea.'
-    PLACEHOLDER: Zástupná/Ukážková hodnota (placeholder)
+    PLACEHOLDER: 'Zástupná/Ukážková hodnota (placeholder)'
     PLURALNAME: 'Textové polia'
     RANGE_TO: do
     SINGULARNAME: 'Textové pole'
@@ -178,8 +178,8 @@ sk:
     EMAILBODY: Správa
     EMAILBODYHTML: Správa
     EMAILFROM: Od
-    EMAILRECIPIENTS: 'Príjemcovia'
-    EMAILSUBJECT: 'Predmet'
+    EMAILRECIPIENTS: Príjemcovia
+    EMAILSUBJECT: Predmet
     EMAILTEMPLATE: 'E-mailová šablóna'
     ENABLELIVEVALIDATION: 'Povoliť živú validáciu?'
     EmailFromContent: 'Políčko "E-mail odosielateľa" umožňuje nastaviť adresu, od koho príde e-mail. Na väčšine serverov musí mať táto adresa nastavenú rovnakú doménu ako je doména stránky. Napr. na stránke mojastranka.sk musí byť táto adresa nieco@mojastranka.sk. Avšak ako "Odpoveď na" môžete zadať ľubovoľnú e-mailovú adresu, na ktorú príde odpoveď.'
@@ -208,7 +208,7 @@ sk:
     SENDPLAIN: 'Poslať e-mail ako obyčajný text? (HTML značky budú odstránené)'
     SHOWCLEARFORM: 'Zobraziť resetovacie tlačidlo?'
     SINGULARNAME: 'Jednoduchý formulár'
-    SUBMISSIONS: Podané formuláre
+    SUBMISSIONS: 'Podané formuláre'
     SUBMITBUTTON: Odoslať
     TEXTONCLEAR: 'Text na tlačidle RESET:'
     TEXTONSUBMIT: 'Text na tlačidle ODOSLAŤ:'
@@ -225,7 +225,7 @@ sk:
     ADD_FIELD: 'Pridať políčko'
     ADD_FIELD_GROUP: 'Pridať obaľovaciu skupinu'
     ADD_PAGE_BREAK: 'Pridať ďalšiu stranu'
-    FORMFIELDS: 'Formulár'
+    FORMFIELDS: Formulár
   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'
diff --git a/lang/sr_RS.yml b/lang/sr_RS.yml
index b649598..dbcfe7a 100644
--- a/lang/sr_RS.yml
+++ b/lang/sr_RS.yml
@@ -24,7 +24,7 @@ sr_RS:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Обриши ово поље
+    DELETE: 'Обриши ово поље'
     DRAG: 'Drag to rearrange order of fields'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/sv.yml b/lang/sv.yml
index 78ff664..4252455 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -15,27 +15,27 @@ sv:
     WHEN: När
   EditableCheckbox:
     PLURALNAME: Kryssrutor
-    SINGULARNAME: 'Kryssrutefält'
+    SINGULARNAME: Kryssrutefält
   EditableCheckboxGroupField:
-    PLURALNAME: 'Kryssrutegrupper'
-    SINGULARNAME: 'Kryssrutegrupp'
+    PLURALNAME: Kryssrutegrupper
+    SINGULARNAME: Kryssrutegrupp
   EditableCountryDropdownField:
     PLURALNAME: 'Rullgardinsmenyer för länder'
     SINGULARNAME: 'Rullgardinsmeny för länder'
   EditableDateField:
-    PLURALNAME: 'Datumfält'
-    SINGULARNAME: 'Datumfält'
+    PLURALNAME: Datumfält
+    SINGULARNAME: Datumfält
   EditableDropdown:
     PLURALNAME: Rullgardinsmenyer
-    SINGULARNAME: 'Rullgardinsmenyfält'
+    SINGULARNAME: Rullgardinsmenyfält
   EditableEmailField:
-    PLURALNAME: 'E-postfält'
-    SINGULARNAME: 'E-postfält'
+    PLURALNAME: E-postfält
+    SINGULARNAME: E-postfält
   EditableFileField:
-    PLURALNAME: 'Filuppladdningsfält'
-    SINGULARNAME: 'Filuppladdningsfält'
+    PLURALNAME: Filuppladdningsfält
+    SINGULARNAME: Filuppladdningsfält
   EditableFormField:
-    ADD: Lägg till
+    ADD: 'Lägg till'
     ADDLabel: 'Lägg till alternativ'
     ADDRULE: 'Lägg till regel'
     BLANK: Tom
@@ -48,7 +48,7 @@ sv:
     ENTERQUESTION: 'Skriv fråga'
     EXTRACLASSA: 'Extra stilar/layout'
     EXTRACLASSB: 'Extra CSS-klasser - separera med mellanrum'
-    FIELDCONFIGURATION: 'Fältkonfiguration'
+    FIELDCONFIGURATION: Fältkonfiguration
     FIELDONDEFAULT: 'Fält som standard'
     GREATERTHAN: 'Värde större än'
     GREATERTHANEQUAL: 'Värde större än eller lika med'
@@ -59,14 +59,14 @@ sv:
     LESSTHAN: 'Värde mindre än'
     LESSTHANEQUAL: 'Värde mindre än eller lika med'
     LOCKED: 'Dessa fält kan inte modifieras'
-    MAXVALUE: 'Maxvärde'
-    MINVALUE: 'Minimivärde'
+    MAXVALUE: Maxvärde
+    MINVALUE: Minimivärde
     NOTBLANK: 'Inte tomt'
     NOTVALUE: 'Inte värde'
     OPTIONS: Alternativ
     PLURALNAME: 'Redigeringsbara formulärfält'
     REQUIRED: 'Är detta fält obligatoriskt?'
-    RIGHTTITLE: 'Högertitel'
+    RIGHTTITLE: Högertitel
     SHOW: Visa
     SHOWOPTIONS: 'Visa alternativ'
     SHOWTHISFIELD: 'Visa detta fält'
@@ -83,11 +83,11 @@ sv:
     STEP_TITLE: 'Sida {page}'
   EditableLiteralField:
     HIDEFROMREPORT: 'Göm från rapport?'
-    PLURALNAME: 'HTML-block'
-    SINGULARNAME: 'HTML-block'
+    PLURALNAME: HTML-block
+    SINGULARNAME: HTML-block
   EditableMemberListField:
-    PLURALNAME: 'Medlemsfält'
-    SINGULARNAME: 'Medlemsfält'
+    PLURALNAME: Medlemsfält
+    SINGULARNAME: Medlemsfält
   EditableMultipleOptionField:
     PLURALNAME: 'Redigeringsbart multialternativfält'
     SINGULARNAME: 'Redigeringsbart multialternativfält'
@@ -101,17 +101,17 @@ sv:
     PLURALNAME: 'Redigeringsbara alternativ'
     SINGULARNAME: 'Redigeringsbart alternativ'
   EditableRadioField:
-    PLURALNAME: 'Radiofält'
-    SINGULARNAME: 'Radiofält'
+    PLURALNAME: Radiofält
+    SINGULARNAME: Radiofält
   EditableTextField:
     NUMBERROWS: 'Antal rader'
-    PLURALNAME: 'Textfält'
-    SINGULARNAME: 'Textfält'
-    TEXTLENGTH: 'Textlängd'
+    PLURALNAME: Textfält
+    SINGULARNAME: Textfält
+    TEXTLENGTH: Textlängd
   EditableUploadField:
     SELECTUPLOADFOLDER: 'Välj uppladdningsmapp'
   FieldEditor:
-    ADD: Lägg till
+    ADD: 'Lägg till'
     SELECTAFIELD: 'Välj ett fält'
   Form:
     FIELDISREQUIRED: '%s är obligatoriskt'
@@ -140,8 +140,8 @@ sv:
     EMAILADDRESS: E-post
     EMAILBODY: Innehåll
     EMAILFROM: Från
-    EMAILRECIPIENTS: 'E-postmottagare'
-    EMAILSUBJECT: 'E-postämne'
+    EMAILRECIPIENTS: E-postmottagare
+    EMAILSUBJECT: E-postämne
     ENABLELIVEVALIDATION: 'Aktivera direktvalidering'
     EmailFromContent: 'Från-adressen låter dig ställa in varifrån e-postmeddelandet skickas. På de flesta servrar måste adressen ha samma domännamn som din sajt. Till exempel på yoursite.com så måste adressen vara something@yoursite.com. Det är däremot möjligt att lägga valfri e-postadress under "E-postadress att svara till". '
     FORM: Formulär
@@ -159,7 +159,7 @@ sv:
     SENDPLAIN: 'Skicka e-post som vanlig text? (All HTML kommer tas bort)'
     SHOWCLEARFORM: 'Visa Rensa-knapp'
     SINGULARNAME: 'Användardefinierat formulär'
-    SUBMISSIONS: Inskickade svar
+    SUBMISSIONS: 'Inskickade svar'
     SUBMITBUTTON: Skicka
     TEXTONCLEAR: 'Text på Rensa-knapp:'
     TEXTONSUBMIT: 'Text på Skicka-knapp:'
diff --git a/lang/tr_TR.yml b/lang/tr_TR.yml
index c6bef03..4cb0561 100644
--- a/lang/tr_TR.yml
+++ b/lang/tr_TR.yml
@@ -24,7 +24,7 @@ tr_TR:
     ADDRULE: 'Add Rule'
     BLANK: Blank
     CUSTOMRULES: 'Custom Rules'
-    DELETE: Bu alanı sil
+    DELETE: 'Bu alanı sil'
     DRAG: 'Alanlari yeniden sıralamak için sürükleyin'
     FIELDCONFIGURATION: 'Field Configuration'
     FIELDONDEFAULT: 'Field On Default'
diff --git a/lang/zh.yml b/lang/zh.yml
index e6b0af5..6240a0b 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -1,107 +1,107 @@
 zh:
   CustomRule:
     BLANK: 空白
-    DELETE: 删除
-    GREATERTHAN: '值大于'
-    GREATERTHANEQUAL: '值大于或等于'
-    HIDETHISFIELD: '隐藏这个字段'
+    DELETE: '删除'
+    GREATERTHAN: 值大于
+    GREATERTHANEQUAL: 值大于或等于
+    HIDETHISFIELD: 隐藏这个字段
     IS: 是
-    LESSTHAN: '值小于'
-    LESSTHANEQUAL: '值小于或等于'
-    NOTBLANK: '不是空白'
-    NOTVALUE: '没有值'
-    SHOWTHISFIELD: '显示这个字段'
+    LESSTHAN: 值小于
+    LESSTHANEQUAL: 值小于或等于
+    NOTBLANK: 不是空白
+    NOTVALUE: 没有值
+    SHOWTHISFIELD: 显示这个字段
     VALUE: 值
     WHEN: 当
   EditableCheckbox:
     PLURALNAME: 复选框
-    SINGULARNAME: '复选框字段'
+    SINGULARNAME: 复选框字段
   EditableCheckboxGroupField:
-    PLURALNAME: '复选框组'
-    SINGULARNAME: '复选框组'
+    PLURALNAME: 复选框组
+    SINGULARNAME: 复选框组
   EditableCountryDropdownField:
-    PLURALNAME: '国家下拉列表'
-    SINGULARNAME: '国家下拉列表'
+    PLURALNAME: 国家下拉列表
+    SINGULARNAME: 国家下拉列表
   EditableDateField:
-    PLURALNAME: '日期字段'
-    SINGULARNAME: '日期字段'
+    PLURALNAME: 日期字段
+    SINGULARNAME: 日期字段
   EditableDropdown:
     PLURALNAME: 下拉列表
-    SINGULARNAME: '下拉列表字段'
+    SINGULARNAME: 下拉列表字段
   EditableEmailField:
-    PLURALNAME: '电子邮件字段'
-    SINGULARNAME: '电子邮件字段'
+    PLURALNAME: 电子邮件字段
+    SINGULARNAME: 电子邮件字段
   EditableFileField:
     PLURALNAME: '文件上传字段'
     SINGULARNAME: '文件上传字段'
   EditableFormField:
-    ADD: 添加
+    ADD: '添加'
     ADDRULE: '添加规则'
     BLANK: 空白
-    CHECKEDBYDEFAULT: '默认选中？'
-    CUSTOMERROR: '自定义错误消息'
-    CUSTOMRULES: '自定义规则'
-    DEFAULTTOTODAY: '默认为今天？'
-    DELETE: 删除
-    DRAG: '拖放来对字段进行重新排序'
+    CHECKEDBYDEFAULT: 默认选中？
+    CUSTOMERROR: 自定义错误消息
+    CUSTOMRULES: 自定义规则
+    DEFAULTTOTODAY: 默认为今天？
+    DELETE: '删除'
+    DRAG: 拖放来对字段进行重新排序
     ENTERQUESTION: '键入问题'
     EXTRACLASSA: '额外的造型/布局'
     EXTRACLASSB: '额外的 css 类别 - 用空格来分开多项'
     FIELDCONFIGURATION: '字段配置'
-    FIELDONDEFAULT: '默认字段'
-    GREATERTHAN: '值大于'
-    GREATERTHANEQUAL: '值大于或等于'
+    FIELDONDEFAULT: 默认字段
+    GREATERTHAN: 值大于
+    GREATERTHANEQUAL: 值大于或等于
     GROUP: 小组
     HIDE: 隐藏
-    HIDETHISFIELD: '隐藏这个字段'
+    HIDETHISFIELD: 隐藏这个字段
     IS: 是
-    LESSTHAN: '值小于'
-    LESSTHANEQUAL: '值小于或等于'
-    LOCKED: '这些字段不能被修改'
-    NOTBLANK: '不是空白'
-    NOTVALUE: '没有值'
+    LESSTHAN: 值小于
+    LESSTHANEQUAL: 值小于或等于
+    LOCKED: 这些字段不能被修改
+    NOTBLANK: 不是空白
+    NOTVALUE: 没有值
     OPTIONS: 选项
     PLURALNAME: '可编辑的表格字段'
     REQUIRED: '这个字段是必须的吗？'
     RIGHTTITLE: '右标题'
     SHOW: 显示
-    SHOWOPTIONS: '显示选项'
-    SHOWTHISFIELD: '显示该字段'
+    SHOWOPTIONS: 显示选项
+    SHOWTHISFIELD: 显示该字段
     SINGULARNAME: '可编辑的表格字段'
     VALIDATION: 验证
     VALUE: 值
     WHEN: 当
   EditableFormHeading:
     LEVEL: '选择标题级别'
-    PLURALNAME: 标题
-    SINGULARNAME: 标题
+    PLURALNAME: '标题'
+    SINGULARNAME: '标题'
   EditableLiteralField:
-    HIDEFROMREPORT: '从报告中隐藏？'
+    HIDEFROMREPORT: 从报告中隐藏？
     PLURALNAME: 'HTML 模块'
     SINGULARNAME: 'HTML 模块'
   EditableMemberListField:
-    PLURALNAME: '成员列表字段'
-    SINGULARNAME: '成员列表字段'
+    PLURALNAME: 成员列表字段
+    SINGULARNAME: 成员列表字段
   EditableMultipleOptionField:
-    PLURALNAME: '可编辑的多个选项字段'
-    SINGULARNAME: '可编辑的多个选项字段'
+    PLURALNAME: 可编辑的多个选项字段
+    SINGULARNAME: 可编辑的多个选项字段
   EditableOption:
     DELETE: '删除这个选项'
-    DRAG: '拖放来对选项进行重新排序'
-    LOCKED: '这些字段不能被修改'
-    PLURALNAME: '可编辑的选项'
-    SINGULARNAME: '可编辑的选项'
+    DRAG: 拖放来对选项进行重新排序
+    LOCKED: 这些字段不能被修改
+    PLURALNAME: 可编辑的选项
+    SINGULARNAME: 可编辑的选项
   EditableRadioField:
-    PLURALNAME: '广播字段'
-    SINGULARNAME: '广播字段'
+    PLURALNAME: 广播字段
+    SINGULARNAME: 广播字段
   EditableTextField:
-    NUMBERROWS: '行数'
-    PLURALNAME: '文本字段'
-    SINGULARNAME: '文本字段'
-    TEXTLENGTH: '文本长度'
+    NUMBERROWS: 行数
+    PLURALNAME: 文本字段
+    SINGULARNAME: 文本字段
+    TEXTLENGTH: 文本长度
   FieldEditor:
-    ADD: 添加
-    SELECTAFIELD: '选择一个字段'
+    ADD: '添加'
+    SELECTAFIELD: 选择一个字段
   Form:
     FIELDISREQUIRED: '%s 是必须的'
   GridField:
@@ -111,9 +111,9 @@ zh:
     PLURALNAME: 页面
     SINGULARNAME: 页面
   SubmittedFileField:
-    DOWNLOADFILE: '下载文件'
-    PLURALNAME: '已提交的文件字段'
-    SINGULARNAME: '已提交的文件字段'
+    DOWNLOADFILE: 下载文件
+    PLURALNAME: 已提交的文件字段
+    SINGULARNAME: 已提交的文件字段
   SubmittedForm:
     PLURALNAME: '已提交的表格'
     SINGULARNAME: '已提交的表格'
@@ -122,34 +122,34 @@ zh:
     SINGULARNAME: '已提交的表格字段'
   UserDefinedForm:
     ADDEMAILRECIPIENT: '添加电子邮件收件人'
-    CONFIGURATION: 配置
+    CONFIGURATION: '配置'
     DESCRIPTION: '添加一个可定制的表格。'
     EMAILADDRESS: 电子邮件
     EMAILBODY: 正文
-    EMAILFROM: 表格
-    EMAILRECIPIENTS: '电子邮件收件人'
-    EMAILSUBJECT: '电子邮件主题'
-    ENABLELIVEVALIDATION: '启用现场验证'
+    EMAILFROM: '表格'
+    EMAILRECIPIENTS: 电子邮件收件人
+    EMAILSUBJECT: 电子邮件主题
+    ENABLELIVEVALIDATION: 启用现场验证
     EmailFromContent: '表格地址允许您设置电子邮件的发送人。在大多数服务器上这必须要设置成域名与您的站点域名一致的电子邮件地址。例如在 yoursite.com 上，发送人的电子邮件地址必须为 something@yoursite.com。但是您可以随意设置回复的电子邮件地址。'
-    FORM: 表格
-    FROMADDRESS: '发送人电子邮件'
+    FORM: '表格'
+    FROMADDRESS: 发送人电子邮件
     HIDEFIELDLABELS: '隐藏字段标签'
     HIDEFORMDATA: '从电子邮件中隐藏表格数据？'
-    ONCOMPLETELABEL: '完成时显示'
+    ONCOMPLETELABEL: 完成时显示
     ORSELECTAFIELDTOUSEASFROM: '.. 或选择某字段作为回复地址'
     ORSELECTAFIELDTOUSEASTO: '.. 或选择某字段作为地址使用'
-    REPLYADDRESS: '用于回复的电子邮件'
+    REPLYADDRESS: 用于回复的电子邮件
     SAVESUBMISSIONS: '禁用保存提交内容到服务器'
-    SENDEMAILTO: '发送电子邮件到'
+    SENDEMAILTO: 发送电子邮件到
     SENDPLAIN: '以纯文本形式发送电子邮件？（HTML 将会被去除）'
     SHOWCLEARFORM: '显示清除表格按钮'
     SINGULARNAME: '用户定义表格'
     SUBMISSIONS: 提交
     SUBMITBUTTON: 提交
-    TEXTONSUBMIT: '提交按钮上的文本'
+    TEXTONSUBMIT: 提交按钮上的文本
   UserDefinedForm_EmailRecipient:
     PLURALNAME: '用户定义的表格电子邮件接受者'
     SINGULARNAME: '用户定义的表格电子邮件接受者'
   UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: '筛选器提交……'
-    WHEREVALUEIS: '当值为……'
+    FILTERSUBMISSIONS: 筛选器提交……
+    WHEREVALUEIS: 当值为……