diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5509be2b..58bfdc21 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,9 @@ Changelog
 2.1.3 (Unreleased)
 ------------------
 * Added missing `control-label`` classes in bootstrap templates
+* Fixed related_name inconsistency with django CMS 3.3.1
+* Dropped support for djangoCMS < 3.2
+* Introduced support for djangoCMS 3.4.0
 
 2.1.2 (2016-06-17)
 ------------------
diff --git a/aldryn_forms/__init__.py b/aldryn_forms/__init__.py
index c05c0532..6971b60b 100644
--- a/aldryn_forms/__init__.py
+++ b/aldryn_forms/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.1.2'
+__version__ = '2.1.3rc1'
diff --git a/aldryn_forms/cms_plugins.py b/aldryn_forms/cms_plugins.py
index 6494962e..eafee785 100644
--- a/aldryn_forms/cms_plugins.py
+++ b/aldryn_forms/cms_plugins.py
@@ -84,9 +84,6 @@ class FormPlugin(FieldContainer):
     )
 
     def render(self, context, instance, placeholder):
-        # remove once cms 3.0.6 is released
-        self.render_template = self.get_render_template(context, instance, placeholder)
-
         context = super(FormPlugin, self).render(context, instance, placeholder)
         request = context['request']
 
@@ -353,8 +350,6 @@ def get_form_field_widget_kwargs(self, instance):
         return {}
 
     def render(self, context, instance, placeholder):
-        templates = self.get_template_names(instance)
-        self.render_template = select_template(templates)
         context = super(Field, self).render(context, instance, placeholder)
 
         form = context.get('form')
@@ -365,6 +360,10 @@ def render(self, context, instance, placeholder):
             context['field'] = form[field_name]
         return context
 
+    def get_render_template(self, context, instance, placeholder):
+        templates = self.get_template_names(instance)
+        return select_template(templates)
+
     def get_fieldsets(self, request, obj=None):
         if self.fieldsets or self.fields:
             # Allows overriding using fieldsets or fields. If you do that none
diff --git a/aldryn_forms/locale/de/LC_MESSAGES/django.mo b/aldryn_forms/locale/de/LC_MESSAGES/django.mo
index d5ab1866..41e2d126 100644
Binary files a/aldryn_forms/locale/de/LC_MESSAGES/django.mo and b/aldryn_forms/locale/de/LC_MESSAGES/django.mo differ
diff --git a/aldryn_forms/locale/de/LC_MESSAGES/django.po b/aldryn_forms/locale/de/LC_MESSAGES/django.po
index cde3e2b0..414c1f52 100644
--- a/aldryn_forms/locale/de/LC_MESSAGES/django.po
+++ b/aldryn_forms/locale/de/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-15 13:11+0200\n"
+"POT-Creation-Date: 2016-08-24 09:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Angelo Dini <finalangeljp@hotmail.com>, 2016\n"
 "Language-Team: German (https://www.transifex.com/divio/teams/58664/de/)\n"
@@ -62,14 +62,14 @@ msgstr "Feld"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:4
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:4
-#: models.py:294 models.py:442
+#: models.py:308 models.py:457
 #: templates/admin/aldryn_forms/display/submission_data.html:4
 msgid "Label"
 msgstr "Beschreibung"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:5
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:5
-#: models.py:432 templates/admin/aldryn_forms/display/submission_data.html:5
+#: models.py:447 templates/admin/aldryn_forms/display/submission_data.html:5
 msgid "Value"
 msgstr "Wert"
 
@@ -81,25 +81,19 @@ msgid "Export form submissions"
 msgstr "Formularübermittlungen exportieren"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:8
+#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
+#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
 #: templates/admin/aldryn_forms/export.html:8
-msgid ""
-"\n"
-"                Please correct the error below."
-msgid_plural ""
-"Please correct the errors below.\n"
-"            "
-msgstr[0] ""
-"\n"
-"                Bitte korrigieren Sie den unten aufgeführten Fehler."
-msgstr[1] ""
-"Bitte korrigieren Sie die unten aufgeführten Fehler.\n"
-"            "
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Bitte korrigieren Sie den unten aufgeführten Fehler."
+msgstr[1] "Bitte korrigieren Sie die unten aufgeführten Fehler."
 
-#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:32
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:30
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export_wizard.html:11
 #: boilerplates/legacy/templates/admin/aldryn_forms/export.html:27
 #: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:30
-#: templates/admin/aldryn_forms/export.html:32
+#: templates/admin/aldryn_forms/export.html:30
 #: templates/admin/aldryn_forms/export_wizard.html:11
 msgid "Export"
 msgstr "Exportieren"
@@ -170,86 +164,79 @@ msgstr ""
 "Vielen Dank, dass Sie sich Zeit genommen haben, dieses Formular auszufüllen."
 " Sie werden umgehend <a href=\"%(form_success_url)s\">weitergeleitet</a>."
 
-#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
-#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Bitte korrigieren Sie den unten aufgeführten Fehler."
-msgstr[1] "Bitte korrigieren Sie die unten aufgeführten Fehler."
-
-#: cms_app.py:9 cms_plugins.py:53
+#: cms_apps.py:9 cms_plugins.py:51
 msgid "Forms"
 msgstr "Formulare"
 
-#: cms_plugins.py:62
+#: cms_plugins.py:60
 msgid "Form"
 msgstr "Formular"
 
-#: cms_plugins.py:209
+#: cms_plugins.py:204
 msgid "The form has been sent."
 msgstr "Das Formular wurde versendet."
 
-#: cms_plugins.py:238
+#: cms_plugins.py:233
 msgid "Fieldset"
 msgstr "Fieldset"
 
-#: cms_plugins.py:257
+#: cms_plugins.py:252
 msgid "Form fields"
 msgstr "Formularfelder"
 
-#: cms_plugins.py:386
+#: cms_plugins.py:383
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: cms_plugins.py:423
+#: cms_plugins.py:420
 msgid "Text Field"
 msgstr "Textfeld"
 
-#: cms_plugins.py:447
+#: cms_plugins.py:444
 msgid "Text Area Field"
 msgstr "Textbereichsfeld"
 
-#: cms_plugins.py:488
+#: cms_plugins.py:485
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: cms_plugins.py:523
+#: cms_plugins.py:520
 msgid "File upload field"
 msgstr "Datei-Hochladen-Feld"
 
-#: cms_plugins.py:603
+#: cms_plugins.py:600
 msgid "Image upload field"
 msgstr "Bild-Hochladen-Feld"
 
-#: cms_plugins.py:641
+#: cms_plugins.py:638
 msgid "Yes/No Field"
 msgstr "Checkbox-Feld"
 
-#: cms_plugins.py:662
+#: cms_plugins.py:659
 msgid "Yes"
 msgstr "Ja"
 
-#: cms_plugins.py:662
+#: cms_plugins.py:659
 msgid "No"
 msgstr "Nein"
 
-#: cms_plugins.py:670
+#: cms_plugins.py:667
 msgid "Select Field"
 msgstr "Auswahlfeld"
 
-#: cms_plugins.py:704
+#: cms_plugins.py:701
 msgid "Multiple Select Field"
 msgstr "Mehrfach-Auswahlfeld"
 
-#: cms_plugins.py:740
+#: cms_plugins.py:737
 msgid "Radio Select Field"
 msgstr "Radio-Button-Auswahlfeld"
 
-#: cms_plugins.py:781
+#: cms_plugins.py:778
 msgid "Captcha Field"
 msgstr "Captcha-Feld"
 
-#: cms_plugins.py:802
+#: cms_plugins.py:799
 msgid "Submit Button"
 msgstr "Senden-Button"
 
@@ -337,52 +324,35 @@ msgstr "Bitte einen Empfänger angeben."
 msgid "Fields"
 msgstr "Felder"
 
-#: forms.py:28
-#, python-format
-msgid "File size must be under %s. Current file size is %s."
-msgstr "Dateigrösse muss unter %s sein. Aktuelle Grösse ist %s."
-
-#: forms.py:62
-#, python-format
-msgid "Image width must be under %s pixels. Current width is %s pixels."
-msgstr ""
-"Bildbreite muss unter %s Pixel gross sein. Aktuelle Breite ist %s Pixel."
-
-#: forms.py:67
-#, python-format
-msgid "Image height must be under %s pixels. Current height is %s pixels."
-msgstr ""
-"Bildhöhe muss unter %s Pixel gross sein. Aktuelle Breite ist %s Pixel."
-
-#: forms.py:158
+#: forms.py:168
 msgid "Please provide CMS page for redirect."
 msgstr "Bitte CMS-Seite angeben für die Weiterleitung."
 
-#: forms.py:162
+#: forms.py:172
 msgid "Please provide an absolute URL for redirect."
 msgstr "Bitte eine absolute URL angeben für die Weiterleitung."
 
-#: forms.py:206
+#: forms.py:216
 msgid "Min value can not be greater then max value."
 msgstr "Der Mindestwert kann nicht grösser sein als der Maximalwert."
 
-#: forms.py:215
+#: forms.py:225
 msgid "Min length"
 msgstr "Mindestlänge"
 
-#: forms.py:216
+#: forms.py:226
 msgid "Required number of characters to type."
 msgstr "Benötigte Anzahl von getippten Zeichen."
 
-#: forms.py:218
+#: forms.py:228
 msgid "Max length"
 msgstr "Maximale Länge"
 
-#: forms.py:219
+#: forms.py:229
 msgid "Maximum number of characters to type."
 msgstr "Maximale Anzahl von getippten Zeichen."
 
-#: forms.py:254
+#: forms.py:264
 msgid ""
 "Explanatory text displayed next to input field. Just like this one. You can "
 "use MAXSIZE as a placeholder for the maximum size configured below."
@@ -391,7 +361,7 @@ msgstr ""
 "MAXSIZE kann als Platzhalter benutzt werden, um die Maximallänge zu "
 "konfigurieren."
 
-#: forms.py:267
+#: forms.py:277
 msgid ""
 "Explanatory text displayed next to input field. Just like this one. You can "
 "use MAXSIZE, MAXWIDTH, MAXHEIGHT as a placeholders for the maximum file size"
@@ -401,94 +371,94 @@ msgstr ""
 "MAXSIZE, MAXWIDTH und MAXHEIGHT können als Platzhalter definiert werden, um "
 "die maximale Dateigrösse oder Dimensionen zu konfigurieren."
 
-#: forms.py:291
+#: forms.py:301
 msgid "Min choices"
 msgstr "Mindestauswahl"
 
-#: forms.py:292
+#: forms.py:302
 msgid "Required amount of elements to chose."
 msgstr "Benötigte Anzahl von auszuwählenden Elementen."
 
-#: forms.py:294
+#: forms.py:304
 msgid "Max choices"
 msgstr "Maximale Auswahlmöglichkeiten"
 
-#: forms.py:295
+#: forms.py:305
 msgid "Maximum amount of elements to chose."
 msgstr "Maximale Anzahl auszuwählender Elemente."
 
-#: models.py:95 models.py:433
+#: models.py:112 models.py:448
 msgid "Default"
 msgstr "Standard"
 
-#: models.py:103 models.py:135
+#: models.py:120 models.py:152
 msgid "CMS Page"
 msgstr "CMS-Seite"
 
-#: models.py:104 models.py:136
+#: models.py:121 models.py:153
 msgid "Absolute URL"
 msgstr "Absolute URL"
 
-#: models.py:111
+#: models.py:128
 msgid "Name"
 msgstr "Name"
 
-#: models.py:113
+#: models.py:130
 msgid "Used to filter out form submissions."
 msgstr "Benutzt um Formulareinträge zu filtern."
 
-#: models.py:116 models.py:297
+#: models.py:133 models.py:311
 msgid "Error message"
 msgstr "Fehlermeldung"
 
-#: models.py:119
+#: models.py:136
 msgid "An error message that will be displayed if the form doesn't validate."
 msgstr ""
 "Eine Fehlermeldung, die angezeigt wird, wenn das Formular ungültig ist."
 
-#: models.py:123
+#: models.py:140
 msgid "Success message"
 msgstr "Erfolgsmeldung"
 
-#: models.py:126
+#: models.py:143
 msgid "An success message that will be displayed."
 msgstr "Erfolgsmeldung, die angezeigt wird."
 
-#: models.py:129
+#: models.py:146
 msgid "Redirect to"
 msgstr "Weiterleiten nach"
 
-#: models.py:132
+#: models.py:149
 msgid "Where to redirect the user when the form has been successfully sent?"
 msgstr ""
 "Wohin soll der Benutzer weitergeleitet werden, wenn das Formular erfolgreich"
 " versandt wurde?"
 
-#: models.py:138 models.py:285 models.py:331 models.py:444
+#: models.py:155 models.py:298 models.py:345 models.py:459
 msgid "custom css classes"
 msgstr "Benutzerdefinierte CSS-Klassen"
 
-#: models.py:140
+#: models.py:157
 msgid "form template"
 msgstr "Formularvorlage"
 
-#: models.py:149
+#: models.py:166
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: models.py:152
+#: models.py:169
 msgid "People who will get the form content via e-mail."
 msgstr "Personen, welche den Formularinhalt per E-Mail erhalten."
 
-#: models.py:283
+#: models.py:296
 msgid "Legend"
 msgstr "Legende"
 
-#: models.py:295
+#: models.py:309
 msgid "Field is required"
 msgstr "Feld ist zwingend erforderlich"
 
-#: models.py:300
+#: models.py:314
 msgid ""
 "Error message displayed if the required field is left empty. Default: \"This"
 " field is required\"."
@@ -496,11 +466,11 @@ msgstr ""
 "Fehlermeldung, die angezeigt wird, wenn das erforderliche Feld leer gelassen"
 " wird. Standard: \"Dieses Feld muss ausgefüllt werden\"."
 
-#: models.py:304
+#: models.py:318
 msgid "Placeholder text"
 msgstr "Platzhaltertext"
 
-#: models.py:307
+#: models.py:321
 msgid ""
 "Default text in a form. Disappears when user starts typing. Example: "
 "\"email@exmaple.com\""
@@ -508,33 +478,33 @@ msgstr ""
 "Standardtext im Formular. Verschwindet, sobald der Benutzer zu tippen "
 "anfängt. Beispiel: \"email@exmaple.com\""
 
-#: models.py:311
+#: models.py:325
 msgid "Help text"
 msgstr "Hilfetext"
 
-#: models.py:314
+#: models.py:328
 msgid "Explanatory text displayed next to input field. Just like this one."
 msgstr ""
 "Erläuterungstext, der neben dem Eingabefeld angezeigt wird. Genau wie dieser"
 " Text."
 
-#: models.py:321
+#: models.py:335
 msgid "Min value"
 msgstr "Mindestwert"
 
-#: models.py:324
+#: models.py:338
 msgid "Max value"
 msgstr "Maximalwert"
 
-#: models.py:365
+#: models.py:380
 msgid "columns"
 msgstr "Spalten"
 
-#: models.py:367
+#: models.py:382
 msgid "rows"
 msgstr "Zeilen"
 
-#: models.py:374
+#: models.py:389
 msgid ""
 "When checked, the value of this field will be used to send an email "
 "notification."
@@ -542,31 +512,31 @@ msgstr ""
 "Wenn aktiviert, wird der Wert dieses Feldes verwendet, um eine E-Mail-"
 "Benachrichtigung zu senden."
 
-#: models.py:378
+#: models.py:393
 msgid "email subject"
 msgstr "E-Mail-Betreff"
 
-#: models.py:382
+#: models.py:397
 msgid "Used as the email subject when email_send_notification is checked."
 msgstr ""
 "Wird als E-Mail-Betreff verwendet, wenn \"email_send_notification\" "
 "aktiviert ist."
 
-#: models.py:386
+#: models.py:401
 msgid "Additional email body"
 msgstr "Zusätzlicher E-Mail-Inhalt"
 
-#: models.py:389
+#: models.py:404
 msgid "Additional body text used when email notifications are active."
 msgstr ""
 "Zusätzlicher Inhaltstext wird dargestellt, wenn E-Mail-Benachrichtigungen "
 "aktiv sind."
 
-#: models.py:396
+#: models.py:411
 msgid "Upload files to"
 msgstr "Dateien hochladen nach"
 
-#: models.py:397
+#: models.py:412
 msgid ""
 "Select a folder to which all files submitted through this field will be "
 "uploaded to."
@@ -574,11 +544,11 @@ msgstr ""
 "Verzeichnis auswählen, in das alle über dieses Feld übermittelten Dateien "
 "hochgeladen werden."
 
-#: models.py:401
+#: models.py:416
 msgid "Maximum file size"
 msgstr "Maximale Dateigrösse"
 
-#: models.py:403
+#: models.py:418
 msgid ""
 "The maximum file size of the upload, in bytes. You can use common size "
 "suffixes (kB, MB, GB, ...)."
@@ -586,49 +556,49 @@ msgstr ""
 "Die maximale Dateigröße des Upload in bytes. Es können gebräuchliche Suffixe"
 " für die Grösse  verwendet werden (kB, MB, GB, ...)."
 
-#: models.py:417
+#: models.py:432
 msgid "Maximum image width"
 msgstr "Maximale Bildgrösse"
 
-#: models.py:419
+#: models.py:434
 msgid "The maximum width of the uploaded image, in pixels."
 msgstr "Die maximale Breite des hochgeladenen Bildes in Pixel."
 
-#: models.py:422
+#: models.py:437
 msgid "Maximum image height"
 msgstr "Maximale Bildhöhe"
 
-#: models.py:424
+#: models.py:439
 msgid "The maximum height of the uploaded image, in pixels."
 msgstr "Die maximale Höhe des hochgeladenen Bildes in Pixel."
 
-#: models.py:454
+#: models.py:470
 msgid "form name"
 msgstr "Formularname"
 
-#: models.py:460
+#: models.py:476
 msgid "users notified"
 msgstr "Benachrichtigte Benutzer"
 
-#: models.py:462
+#: models.py:478
 msgid "People who got a notification when form was submitted."
 msgstr ""
 "Personen, die eine Benachrichtigung erhalten, sobald ein Formular gesendet "
 "wurde."
 
-#: models.py:466
+#: models.py:482
 msgid "form language"
 msgstr "Formularsprache"
 
-#: models.py:472
+#: models.py:488
 msgid "form url"
 msgstr "URL des Formulars"
 
-#: models.py:480
+#: models.py:496
 msgid "Form submission"
 msgstr "Formulareintrag"
 
-#: models.py:481
+#: models.py:497
 msgid "Form submissions"
 msgstr "Formulareinträge"
 
@@ -658,3 +628,16 @@ msgid ""
 msgstr ""
 "Sie können nicht mehr als %(limit_value)d Optionen (gewählt %(show_value)d) "
 "angeben."
+
+#~ msgid ""
+#~ "\n"
+#~ "                Please correct the error below."
+#~ msgid_plural ""
+#~ "Please correct the errors below.\n"
+#~ "            "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "                Bitte korrigieren Sie den unten aufgeführten Fehler."
+#~ msgstr[1] ""
+#~ "Bitte korrigieren Sie die unten aufgeführten Fehler.\n"
+#~ "            "
diff --git a/aldryn_forms/locale/en/LC_MESSAGES/django.mo b/aldryn_forms/locale/en/LC_MESSAGES/django.mo
index 0ccfc043..51bddf5b 100644
Binary files a/aldryn_forms/locale/en/LC_MESSAGES/django.mo and b/aldryn_forms/locale/en/LC_MESSAGES/django.mo differ
diff --git a/aldryn_forms/locale/en/LC_MESSAGES/django.po b/aldryn_forms/locale/en/LC_MESSAGES/django.po
index a597ece2..34e3f4e9 100644
--- a/aldryn_forms/locale/en/LC_MESSAGES/django.po
+++ b/aldryn_forms/locale/en/LC_MESSAGES/django.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-15 13:11+0200\n"
+"POT-Creation-Date: 2016-08-24 09:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #: admin/base.py:39
 msgid "data"
@@ -58,14 +58,14 @@ msgstr "Field"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:4
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:4
-#: models.py:294 models.py:442
+#: models.py:308 models.py:457
 #: templates/admin/aldryn_forms/display/submission_data.html:4
 msgid "Label"
 msgstr "Label"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:5
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:5
-#: models.py:432 templates/admin/aldryn_forms/display/submission_data.html:5
+#: models.py:447 templates/admin/aldryn_forms/display/submission_data.html:5
 msgid "Value"
 msgstr "Value"
 
@@ -77,25 +77,19 @@ msgid "Export form submissions"
 msgstr "Export form submissions"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:8
+#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
+#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
 #: templates/admin/aldryn_forms/export.html:8
-msgid ""
-"\n"
-"                Please correct the error below."
-msgid_plural ""
-"Please correct the errors below.\n"
-"            "
-msgstr[0] ""
-"\n"
-"                Please correct the error below."
-msgstr[1] ""
-"Please correct the errors below.\n"
-"            "
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Please correct the error below."
+msgstr[1] "Please correct the errors below."
 
-#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:32
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:30
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export_wizard.html:11
 #: boilerplates/legacy/templates/admin/aldryn_forms/export.html:27
 #: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:30
-#: templates/admin/aldryn_forms/export.html:32
+#: templates/admin/aldryn_forms/export.html:30
 #: templates/admin/aldryn_forms/export_wizard.html:11
 msgid "Export"
 msgstr "Export"
@@ -160,92 +154,85 @@ msgstr "Required field"
 #: boilerplates/bootstrap3/templates/aldryn_forms/form.html:19
 #, python-format
 msgid ""
-"Thank you for submitting your information, you will be <a "
-"href=\"%(form_success_url)s\">redirected shortly</a>."
+"Thank you for submitting your information, you will be <a href="
+"\"%(form_success_url)s\">redirected shortly</a>."
 msgstr ""
-"Thank you for submitting your information, you will be <a "
-"href=\"%(form_success_url)s\">redirected shortly</a>."
+"Thank you for submitting your information, you will be <a href="
+"\"%(form_success_url)s\">redirected shortly</a>."
 
-#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
-#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Please correct the error below."
-msgstr[1] "Please correct the errors below."
-
-#: cms_app.py:9 cms_plugins.py:53
+#: cms_apps.py:9 cms_plugins.py:51
 msgid "Forms"
 msgstr "Forms"
 
-#: cms_plugins.py:62
+#: cms_plugins.py:60
 msgid "Form"
 msgstr "Form"
 
-#: cms_plugins.py:209
+#: cms_plugins.py:204
 msgid "The form has been sent."
 msgstr "The form has been sent."
 
-#: cms_plugins.py:238
+#: cms_plugins.py:233
 msgid "Fieldset"
 msgstr "Fieldset"
 
-#: cms_plugins.py:257
+#: cms_plugins.py:252
 msgid "Form fields"
 msgstr "Form fields"
 
-#: cms_plugins.py:386
+#: cms_plugins.py:383
 msgid "Advanced Settings"
 msgstr "Advanced Settings"
 
-#: cms_plugins.py:423
+#: cms_plugins.py:420
 msgid "Text Field"
 msgstr "Text Field"
 
-#: cms_plugins.py:447
+#: cms_plugins.py:444
 msgid "Text Area Field"
 msgstr "Text Area Field"
 
-#: cms_plugins.py:488
+#: cms_plugins.py:485
 msgid "Email Field"
 msgstr "Email Field"
 
-#: cms_plugins.py:523
+#: cms_plugins.py:520
 msgid "File upload field"
 msgstr "File upload field"
 
-#: cms_plugins.py:603
+#: cms_plugins.py:600
 msgid "Image upload field"
 msgstr "Image upload field"
 
-#: cms_plugins.py:641
+#: cms_plugins.py:638
 msgid "Yes/No Field"
 msgstr "Yes/No Field"
 
-#: cms_plugins.py:662
+#: cms_plugins.py:659
 msgid "Yes"
 msgstr "Yes"
 
-#: cms_plugins.py:662
+#: cms_plugins.py:659
 msgid "No"
 msgstr "No"
 
-#: cms_plugins.py:670
+#: cms_plugins.py:667
 msgid "Select Field"
 msgstr "Select Field"
 
-#: cms_plugins.py:704
+#: cms_plugins.py:701
 msgid "Multiple Select Field"
 msgstr "Multiple Select Field"
 
-#: cms_plugins.py:740
+#: cms_plugins.py:737
 msgid "Radio Select Field"
 msgstr "Radio Select Field"
 
-#: cms_plugins.py:781
+#: cms_plugins.py:778
 msgid "Captcha Field"
 msgstr "Captcha Field"
 
-#: cms_plugins.py:802
+#: cms_plugins.py:799
 msgid "Submit Button"
 msgstr "Submit Button"
 
@@ -333,49 +320,57 @@ msgid "Fields"
 msgstr "Fields"
 
 #: forms.py:28
-#, python-format
-msgid "File size must be under %s. Current file size is %s."
+#, fuzzy, python-format
+#| msgid "File size must be under %s. Current file size is %s."
+msgid ""
+"File size must be under %(max_size)s. Current file size is %(actual_size)s."
 msgstr "File size must be under %s. Current file size is %s."
 
-#: forms.py:62
-#, python-format
-msgid "Image width must be under %s pixels. Current width is %s pixels."
+#: forms.py:63
+#, fuzzy, python-format
+#| msgid "Image width must be under %s pixels. Current width is %s pixels."
+msgid ""
+"Image width must be under %(max_size)s pixels. Current width is "
+"%(actual_size)s pixels."
 msgstr "Image width must be under %s pixels. Current width is %s pixels."
 
-#: forms.py:67
-#, python-format
-msgid "Image height must be under %s pixels. Current height is %s pixels."
+#: forms.py:73
+#, fuzzy, python-format
+#| msgid "Image height must be under %s pixels. Current height is %s pixels."
+msgid ""
+"Image height must be under %(max_size)s pixels. Current height is "
+"%(actual_size)s pixels."
 msgstr "Image height must be under %s pixels. Current height is %s pixels."
 
-#: forms.py:158
+#: forms.py:168
 msgid "Please provide CMS page for redirect."
 msgstr "Please provide CMS page for redirect."
 
-#: forms.py:162
+#: forms.py:172
 msgid "Please provide an absolute URL for redirect."
 msgstr "Please provide an absolute URL for redirect."
 
-#: forms.py:206
+#: forms.py:216
 msgid "Min value can not be greater then max value."
 msgstr "Min value can not be greater then max value."
 
-#: forms.py:215
+#: forms.py:225
 msgid "Min length"
 msgstr "Min length"
 
-#: forms.py:216
+#: forms.py:226
 msgid "Required number of characters to type."
 msgstr "Required number of characters to type."
 
-#: forms.py:218
+#: forms.py:228
 msgid "Max length"
 msgstr "Max length"
 
-#: forms.py:219
+#: forms.py:229
 msgid "Maximum number of characters to type."
 msgstr "Maximum number of characters to type."
 
-#: forms.py:254
+#: forms.py:264
 msgid ""
 "Explanatory text displayed next to input field. Just like this one. You can "
 "use MAXSIZE as a placeholder for the maximum size configured below."
@@ -383,113 +378,113 @@ msgstr ""
 "Explanatory text displayed next to input field. Just like this one. You can "
 "use MAXSIZE as a placeholder for the maximum size configured below."
 
-#: forms.py:267
+#: forms.py:277
 msgid ""
 "Explanatory text displayed next to input field. Just like this one. You can "
-"use MAXSIZE, MAXWIDTH, MAXHEIGHT as a placeholders for the maximum file size"
-" and dimensions configured below."
+"use MAXSIZE, MAXWIDTH, MAXHEIGHT as a placeholders for the maximum file size "
+"and dimensions configured below."
 msgstr ""
 "Explanatory text displayed next to input field. Just like this one. You can "
-"use MAXSIZE, MAXWIDTH, MAXHEIGHT as a placeholders for the maximum file size"
-" and dimensions configured below."
+"use MAXSIZE, MAXWIDTH, MAXHEIGHT as a placeholders for the maximum file size "
+"and dimensions configured below."
 
-#: forms.py:291
+#: forms.py:301
 msgid "Min choices"
 msgstr "Min choices"
 
-#: forms.py:292
+#: forms.py:302
 msgid "Required amount of elements to chose."
 msgstr "Required amount of elements to chose."
 
-#: forms.py:294
+#: forms.py:304
 msgid "Max choices"
 msgstr "Max choices"
 
-#: forms.py:295
+#: forms.py:305
 msgid "Maximum amount of elements to chose."
 msgstr "Maximum amount of elements to chose."
 
-#: models.py:95 models.py:433
+#: models.py:112 models.py:448
 msgid "Default"
 msgstr "Default"
 
-#: models.py:103 models.py:135
+#: models.py:120 models.py:152
 msgid "CMS Page"
 msgstr "CMS Page"
 
-#: models.py:104 models.py:136
+#: models.py:121 models.py:153
 msgid "Absolute URL"
 msgstr "Absolute URL"
 
-#: models.py:111
+#: models.py:128
 msgid "Name"
 msgstr "Name"
 
-#: models.py:113
+#: models.py:130
 msgid "Used to filter out form submissions."
 msgstr "Used to filter out form submissions."
 
-#: models.py:116 models.py:297
+#: models.py:133 models.py:311
 msgid "Error message"
 msgstr "Error message"
 
-#: models.py:119
+#: models.py:136
 msgid "An error message that will be displayed if the form doesn't validate."
 msgstr "An error message that will be displayed if the form doesn't validate."
 
-#: models.py:123
+#: models.py:140
 msgid "Success message"
 msgstr "Success message"
 
-#: models.py:126
+#: models.py:143
 msgid "An success message that will be displayed."
 msgstr "An success message that will be displayed."
 
-#: models.py:129
+#: models.py:146
 msgid "Redirect to"
 msgstr "Redirect to"
 
-#: models.py:132
+#: models.py:149
 msgid "Where to redirect the user when the form has been successfully sent?"
 msgstr "Where to redirect the user when the form has been successfully sent?"
 
-#: models.py:138 models.py:285 models.py:331 models.py:444
+#: models.py:155 models.py:298 models.py:345 models.py:459
 msgid "custom css classes"
 msgstr "custom css classes"
 
-#: models.py:140
+#: models.py:157
 msgid "form template"
 msgstr "form template"
 
-#: models.py:149
+#: models.py:166
 msgid "Recipients"
 msgstr "Recipients"
 
-#: models.py:152
+#: models.py:169
 msgid "People who will get the form content via e-mail."
 msgstr "People who will get the form content via e-mail."
 
-#: models.py:283
+#: models.py:296
 msgid "Legend"
 msgstr "Legend"
 
-#: models.py:295
+#: models.py:309
 msgid "Field is required"
 msgstr "Field is required"
 
-#: models.py:300
+#: models.py:314
 msgid ""
-"Error message displayed if the required field is left empty. Default: \"This"
-" field is required\"."
+"Error message displayed if the required field is left empty. Default: \"This "
+"field is required\"."
 msgstr ""
-"Error message displayed if the required field is left empty. Default: \"This"
-" field is required\"."
+"Error message displayed if the required field is left empty. Default: \"This "
+"field is required\"."
 
-#: models.py:304
+#: models.py:318
 msgid "Placeholder text"
 msgstr "Placeholder text"
 
-#: models.py:307
+#: models.py:321
 msgid ""
 "Default text in a form. Disappears when user starts typing. Example: "
 "\"email@exmaple.com\""
@@ -497,31 +492,31 @@ msgstr ""
 "Default text in a form. Disappears when user starts typing. Example: "
 "\"email@exmaple.com\""
 
-#: models.py:311
+#: models.py:325
 msgid "Help text"
 msgstr "Help text"
 
-#: models.py:314
+#: models.py:328
 msgid "Explanatory text displayed next to input field. Just like this one."
 msgstr "Explanatory text displayed next to input field. Just like this one."
 
-#: models.py:321
+#: models.py:335
 msgid "Min value"
 msgstr "Min value"
 
-#: models.py:324
+#: models.py:338
 msgid "Max value"
 msgstr "Max value"
 
-#: models.py:365
+#: models.py:380
 msgid "columns"
 msgstr "columns"
 
-#: models.py:367
+#: models.py:382
 msgid "rows"
 msgstr "rows"
 
-#: models.py:374
+#: models.py:389
 msgid ""
 "When checked, the value of this field will be used to send an email "
 "notification."
@@ -529,27 +524,27 @@ msgstr ""
 "When checked, the value of this field will be used to send an email "
 "notification."
 
-#: models.py:378
+#: models.py:393
 msgid "email subject"
 msgstr "email subject"
 
-#: models.py:382
+#: models.py:397
 msgid "Used as the email subject when email_send_notification is checked."
 msgstr "Used as the email subject when email_send_notification is checked."
 
-#: models.py:386
+#: models.py:401
 msgid "Additional email body"
 msgstr "Additional email body"
 
-#: models.py:389
+#: models.py:404
 msgid "Additional body text used when email notifications are active."
 msgstr "Additional body text used when email notifications are active."
 
-#: models.py:396
+#: models.py:411
 msgid "Upload files to"
 msgstr "Upload files to"
 
-#: models.py:397
+#: models.py:412
 msgid ""
 "Select a folder to which all files submitted through this field will be "
 "uploaded to."
@@ -557,11 +552,11 @@ msgstr ""
 "Select a folder to which all files submitted through this field will be "
 "uploaded to."
 
-#: models.py:401
+#: models.py:416
 msgid "Maximum file size"
 msgstr "Maximum file size"
 
-#: models.py:403
+#: models.py:418
 msgid ""
 "The maximum file size of the upload, in bytes. You can use common size "
 "suffixes (kB, MB, GB, ...)."
@@ -569,47 +564,47 @@ msgstr ""
 "The maximum file size of the upload, in bytes. You can use common size "
 "suffixes (kB, MB, GB, ...)."
 
-#: models.py:417
+#: models.py:432
 msgid "Maximum image width"
 msgstr "Maximum image width"
 
-#: models.py:419
+#: models.py:434
 msgid "The maximum width of the uploaded image, in pixels."
 msgstr "The maximum width of the uploaded image, in pixels."
 
-#: models.py:422
+#: models.py:437
 msgid "Maximum image height"
 msgstr "Maximum image height"
 
-#: models.py:424
+#: models.py:439
 msgid "The maximum height of the uploaded image, in pixels."
 msgstr "The maximum height of the uploaded image, in pixels."
 
-#: models.py:454
+#: models.py:470
 msgid "form name"
 msgstr "form name"
 
-#: models.py:460
+#: models.py:476
 msgid "users notified"
 msgstr "users notified"
 
-#: models.py:462
+#: models.py:478
 msgid "People who got a notification when form was submitted."
 msgstr "People who got a notification when form was submitted."
 
-#: models.py:466
+#: models.py:482
 msgid "form language"
 msgstr "form language"
 
-#: models.py:472
+#: models.py:488
 msgid "form url"
 msgstr "form url"
 
-#: models.py:480
+#: models.py:496
 msgid "Form submission"
 msgstr "Form submission"
 
-#: models.py:481
+#: models.py:497
 msgid "Form submissions"
 msgstr "Form submissions"
 
@@ -639,3 +634,16 @@ msgid ""
 "You can't choose more than %(limit_value)d options (chosen %(show_value)d)."
 msgstr ""
 "You can't choose more than %(limit_value)d options (chosen %(show_value)d)."
+
+#~ msgid ""
+#~ "\n"
+#~ "                Please correct the error below."
+#~ msgid_plural ""
+#~ "Please correct the errors below.\n"
+#~ "            "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "                Please correct the error below."
+#~ msgstr[1] ""
+#~ "Please correct the errors below.\n"
+#~ "            "
diff --git a/aldryn_forms/locale/fr/LC_MESSAGES/django.mo b/aldryn_forms/locale/fr/LC_MESSAGES/django.mo
index 0124ce97..1171736c 100644
Binary files a/aldryn_forms/locale/fr/LC_MESSAGES/django.mo and b/aldryn_forms/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/aldryn_forms/locale/fr/LC_MESSAGES/django.po b/aldryn_forms/locale/fr/LC_MESSAGES/django.po
index 34377614..f5afe75b 100644
--- a/aldryn_forms/locale/fr/LC_MESSAGES/django.po
+++ b/aldryn_forms/locale/fr/LC_MESSAGES/django.po
@@ -3,12 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Frigory33 <chironsylvain@orange.fr>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-15 13:11+0200\n"
+"POT-Creation-Date: 2016-08-24 09:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Frigory33 <chironsylvain@orange.fr>, 2016\n"
 "Language-Team: French (https://www.transifex.com/divio/teams/58664/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,94 +21,94 @@ msgstr ""
 
 #: admin/base.py:39
 msgid "data"
-msgstr ""
+msgstr "données"
 
 #: admin/base.py:55
 msgid "people notified"
-msgstr ""
+msgstr "personnes notifiées"
 
 #: admin/forms.py:33
 msgid "from date"
-msgstr ""
+msgstr "depuis le"
 
 #: admin/forms.py:38
 msgid "to date"
-msgstr ""
+msgstr "jusqu'au"
 
 #: admin/forms.py:43
 msgid "language"
-msgstr ""
+msgstr "langue"
 
 #: admin/forms.py:58
 msgid ""
 "Export failed! More then 65,536 entries found, exceeded Excel limitation!"
 msgstr ""
+"L'export a échoué ! Plus de 65 536 entrées ont été trouvées, ce qui est trop"
+" pour Excel !"
 
 #: admin/forms.py:132
 msgid "Please select at least one field to export."
-msgstr ""
+msgstr "Veuillez sélectionner au moins un champ à exporter."
 
 #: admin/views.py:69
 msgid "No records found"
-msgstr ""
+msgstr "Aucun enregistrement trouvé"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:3
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:3
 #: templates/admin/aldryn_forms/display/submission_data.html:3
 msgid "Field"
-msgstr ""
+msgstr "Champ"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:4
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:4
-#: models.py:294 models.py:442
+#: models.py:308 models.py:457
 #: templates/admin/aldryn_forms/display/submission_data.html:4
 msgid "Label"
-msgstr ""
+msgstr "Libellé"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:5
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:5
-#: models.py:432 templates/admin/aldryn_forms/display/submission_data.html:5
+#: models.py:447 templates/admin/aldryn_forms/display/submission_data.html:5
 msgid "Value"
-msgstr ""
+msgstr "Valeur"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:5
 #: boilerplates/legacy/templates/admin/aldryn_forms/export.html:4
 #: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:4
 #: templates/admin/aldryn_forms/export.html:5
 msgid "Export form submissions"
-msgstr ""
+msgstr "Exporter les soumissions du formulaire"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:8
+#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
+#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
 #: templates/admin/aldryn_forms/export.html:8
-msgid ""
-"\n"
-"                Please correct the error below."
-msgid_plural ""
-"Please correct the errors below.\n"
-"            "
-msgstr[0] ""
-msgstr[1] ""
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Veuillez corriger l'erreur ci-dessous."
+msgstr[1] "Veuillez corriger les erreurs ci-dessous."
 
-#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:32
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:30
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export_wizard.html:11
 #: boilerplates/legacy/templates/admin/aldryn_forms/export.html:27
 #: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:30
-#: templates/admin/aldryn_forms/export.html:32
+#: templates/admin/aldryn_forms/export.html:30
 #: templates/admin/aldryn_forms/export_wizard.html:11
 msgid "Export"
-msgstr ""
+msgstr "Exporter"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export_wizard.html:13
 #: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:32
 #: templates/admin/aldryn_forms/export_wizard.html:13
 msgid "Continue"
-msgstr ""
+msgstr "Continuer"
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/formsubmission/change_list.html:9
 #: boilerplates/legacy/templates/admin/aldryn_forms/formsubmission/change_list.html:9
 #: templates/admin/aldryn_forms/formsubmission/change_list.html:9
 msgid "Export Form Entries"
-msgstr ""
+msgstr "Exporter les entrées de formulaire"
 
 #: boilerplates/bootstrap3/templates/aldryn_forms/email_notifications/emails/notification.body.html:9
 #: boilerplates/bootstrap3/templates/aldryn_forms/email_notifications/emails/notification.body.txt:8
@@ -124,7 +127,7 @@ msgstr ""
 #: templates/aldryn_forms/emails/user/notification.body.txt:5
 #, python-format
 msgid "Form name: %(form_name)s"
-msgstr ""
+msgstr "Nom du formulaire : %(form_name)s"
 
 #: boilerplates/bootstrap3/templates/aldryn_forms/email_notifications/emails/notification.subject.txt:1
 #: boilerplates/bootstrap3/templates/aldryn_forms/emails/notification.subject.txt:1
@@ -137,7 +140,7 @@ msgstr ""
 #: templates/aldryn_forms/emails/user/notification.subject.txt:1
 #, python-format
 msgid "[Form submission] %(form_name)s"
-msgstr ""
+msgstr "[Soumission du formulaire] %(form_name)s"
 
 #: boilerplates/bootstrap3/templates/aldryn_forms/field.html:7
 #: boilerplates/bootstrap3/templates/aldryn_forms/fields/emailfield.html:9
@@ -150,7 +153,7 @@ msgstr ""
 #: boilerplates/bootstrap3/templates/aldryn_forms/fields/textfield.html:9
 #: templates/aldryn_forms/field.html:14
 msgid "Required field"
-msgstr ""
+msgstr "Champ requis"
 
 #: boilerplates/bootstrap3/templates/aldryn_forms/form.html:19
 #, python-format
@@ -158,437 +161,440 @@ msgid ""
 "Thank you for submitting your information, you will be <a "
 "href=\"%(form_success_url)s\">redirected shortly</a>."
 msgstr ""
+"Merci d'avoir envoyé vos informations ; vous allé être <a "
+"href=\"%(form_success_url)s\">redirigé·e dans un instant</a>."
 
-#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
-#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: cms_app.py:9 cms_plugins.py:53
+#: cms_apps.py:9 cms_plugins.py:51
 msgid "Forms"
-msgstr ""
+msgstr "Formulaires"
 
-#: cms_plugins.py:62
+#: cms_plugins.py:60
 msgid "Form"
-msgstr ""
+msgstr "Formulaire"
 
-#: cms_plugins.py:209
+#: cms_plugins.py:204
 msgid "The form has been sent."
-msgstr ""
+msgstr "Le formulaire a été envoyé."
 
-#: cms_plugins.py:238
+#: cms_plugins.py:233
 msgid "Fieldset"
-msgstr ""
+msgstr "Groupe de champs"
 
-#: cms_plugins.py:257
+#: cms_plugins.py:252
 msgid "Form fields"
-msgstr ""
+msgstr "Champs du formulaire"
 
-#: cms_plugins.py:386
+#: cms_plugins.py:383
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Paramètres avancés"
 
-#: cms_plugins.py:423
+#: cms_plugins.py:420
 msgid "Text Field"
-msgstr ""
+msgstr "Champ de texte"
 
-#: cms_plugins.py:447
+#: cms_plugins.py:444
 msgid "Text Area Field"
-msgstr ""
+msgstr "Zone de texte"
 
-#: cms_plugins.py:488
+#: cms_plugins.py:485
 msgid "Email Field"
-msgstr ""
+msgstr "Champ de courriel"
 
-#: cms_plugins.py:523
+#: cms_plugins.py:520
 msgid "File upload field"
-msgstr ""
+msgstr "Champ de téléversement de fichier"
 
-#: cms_plugins.py:603
+#: cms_plugins.py:600
 msgid "Image upload field"
-msgstr ""
+msgstr "Champ de téléversement d'image"
 
-#: cms_plugins.py:641
+#: cms_plugins.py:638
 msgid "Yes/No Field"
-msgstr ""
+msgstr "Champ Oui/Non"
 
-#: cms_plugins.py:662
+#: cms_plugins.py:659
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
-#: cms_plugins.py:662
+#: cms_plugins.py:659
 msgid "No"
-msgstr ""
+msgstr "Non"
 
-#: cms_plugins.py:670
+#: cms_plugins.py:667
 msgid "Select Field"
-msgstr ""
+msgstr "Liste déroulante"
 
-#: cms_plugins.py:704
+#: cms_plugins.py:701
 msgid "Multiple Select Field"
-msgstr ""
+msgstr "Champ de sélection multiple"
 
-#: cms_plugins.py:740
+#: cms_plugins.py:737
 msgid "Radio Select Field"
-msgstr ""
+msgstr "Champ de sélection radio"
 
-#: cms_plugins.py:781
+#: cms_plugins.py:778
 msgid "Captcha Field"
-msgstr ""
+msgstr "Champ de captcha"
 
-#: cms_plugins.py:802
+#: cms_plugins.py:799
 msgid "Submit Button"
-msgstr ""
+msgstr "Bouton Envoyer"
 
 #: contrib/email_notifications/cms_plugins.py:26
 msgid "new email notification"
-msgstr ""
+msgstr "nouvelle notification par courriel"
 
 #: contrib/email_notifications/cms_plugins.py:27
 msgid "new email notifications"
-msgstr ""
+msgstr "nouvelles notifications par courriel"
 
 #: contrib/email_notifications/cms_plugins.py:63
 #, python-brace-format
 msgid ""
 "variables can be used with by wrapping with \"${variable}\" like ${variable}"
 msgstr ""
+"les variables peuvent être utilisées en les encadrant avec \"${variable}\" "
+"comme ${variable}"
 
 #: contrib/email_notifications/cms_plugins.py:117
 msgid "available text variables"
-msgstr ""
+msgstr "variables de texte disponibles"
 
 #: contrib/email_notifications/cms_plugins.py:121
 msgid "Form (Advanced)"
-msgstr ""
+msgstr "Formulaire (avancé)"
 
 #: contrib/email_notifications/models.py:28
 msgid "default"
-msgstr ""
+msgstr "par défaut"
 
 #: contrib/email_notifications/models.py:61
 msgid "theme"
-msgstr ""
+msgstr "thème"
 
 #: contrib/email_notifications/models.py:63
 msgid "Provides the base theme for the email."
-msgstr ""
+msgstr "Utilise le thème de base pour le courriel."
 
 #: contrib/email_notifications/models.py:67
 msgid "to name"
-msgstr ""
+msgstr "au nom"
 
 #: contrib/email_notifications/models.py:72
 msgid "to email"
-msgstr ""
+msgstr "à l'adresse électronique"
 
 #: contrib/email_notifications/models.py:78
 msgid "to user"
-msgstr ""
+msgstr "à l'utilisateur"
 
 #: contrib/email_notifications/models.py:84
 msgid "from name"
-msgstr ""
+msgstr "du nom"
 
 #: contrib/email_notifications/models.py:89
 msgid "from email"
-msgstr ""
+msgstr "du courriel"
 
 #: contrib/email_notifications/models.py:94
 msgid "subject"
-msgstr ""
+msgstr "objet"
 
 #: contrib/email_notifications/models.py:99
 msgid "email body (txt)"
-msgstr ""
+msgstr "corps du courriel (txt)"
 
 #: contrib/email_notifications/models.py:101
 msgid "used when rendering the email in text only mode."
-msgstr ""
+msgstr "utilisé lors de l'affichage du courriel en mode texte."
 
 #: contrib/email_notifications/models.py:104
 msgid "email body (html)"
-msgstr ""
+msgstr "corps du courriel (html)"
 
 #: contrib/email_notifications/models.py:106
 msgid "used when rendering the email in html."
-msgstr ""
+msgstr "utilisé lors de l'affichage du courriel en HTML."
 
 #: contrib/email_notifications/models.py:122
 msgid "Please provide a recipient."
-msgstr ""
+msgstr "Veuillez indiquer un destinataire."
 
 #: contrib/email_notifications/notification.py:54
 msgid "Fields"
-msgstr ""
+msgstr "Champs"
 
-#: forms.py:28
-#, python-format
-msgid "File size must be under %s. Current file size is %s."
-msgstr ""
-
-#: forms.py:62
-#, python-format
-msgid "Image width must be under %s pixels. Current width is %s pixels."
-msgstr ""
-
-#: forms.py:67
-#, python-format
-msgid "Image height must be under %s pixels. Current height is %s pixels."
-msgstr ""
-
-#: forms.py:158
+#: forms.py:168
 msgid "Please provide CMS page for redirect."
-msgstr ""
+msgstr "Veuillez indiquer une page du CMS pour la redirection."
 
-#: forms.py:162
+#: forms.py:172
 msgid "Please provide an absolute URL for redirect."
-msgstr ""
+msgstr "Veuillez indiquer une URL absolue pour la redirection."
 
-#: forms.py:206
+#: forms.py:216
 msgid "Min value can not be greater then max value."
-msgstr ""
+msgstr "La valeur minimale doit être inférieure à la valeur maximale."
 
-#: forms.py:215
+#: forms.py:225
 msgid "Min length"
-msgstr ""
+msgstr "Longueur minimale"
 
-#: forms.py:216
+#: forms.py:226
 msgid "Required number of characters to type."
-msgstr ""
+msgstr "Nombre de caractères à saisir requis."
 
-#: forms.py:218
+#: forms.py:228
 msgid "Max length"
-msgstr ""
+msgstr "Longueur maximale"
 
-#: forms.py:219
+#: forms.py:229
 msgid "Maximum number of characters to type."
-msgstr ""
+msgstr "Nombre maximum de caractères à saisir."
 
-#: forms.py:254
+#: forms.py:264
 msgid ""
 "Explanatory text displayed next to input field. Just like this one. You can "
 "use MAXSIZE as a placeholder for the maximum size configured below."
 msgstr ""
+"Texte explicatif affiché à côté du champ. Tout comme celui-ci. Vous pouvez "
+"utiliser MAXSIZE pour reprendre la taille maximale configurée plus bas."
 
-#: forms.py:267
+#: forms.py:277
 msgid ""
 "Explanatory text displayed next to input field. Just like this one. You can "
 "use MAXSIZE, MAXWIDTH, MAXHEIGHT as a placeholders for the maximum file size"
 " and dimensions configured below."
 msgstr ""
+"Texte explicatif affiché à côté du champ. Tout comme celui-ci. Vous pouvez "
+"utiliser MAXSIZE, MAXWIDTH et MAXHEIGHT pour reprendre la taille et les "
+"dimensions maximales configurées plus bas."
 
-#: forms.py:291
+#: forms.py:301
 msgid "Min choices"
-msgstr ""
+msgstr "Choix au minimum"
 
-#: forms.py:292
+#: forms.py:302
 msgid "Required amount of elements to chose."
-msgstr ""
+msgstr "Nombre d'éléments à choisir au minimum."
 
-#: forms.py:294
+#: forms.py:304
 msgid "Max choices"
-msgstr ""
+msgstr "Choix au maximum"
 
-#: forms.py:295
+#: forms.py:305
 msgid "Maximum amount of elements to chose."
-msgstr ""
+msgstr "Nombre d'éléments à choisir au maximum."
 
-#: models.py:95 models.py:433
+#: models.py:112 models.py:448
 msgid "Default"
-msgstr ""
+msgstr "Par défaut"
 
-#: models.py:103 models.py:135
+#: models.py:120 models.py:152
 msgid "CMS Page"
-msgstr ""
+msgstr "Page du CMS"
 
-#: models.py:104 models.py:136
+#: models.py:121 models.py:153
 msgid "Absolute URL"
-msgstr ""
+msgstr "URL absolue"
 
-#: models.py:111
+#: models.py:128
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
-#: models.py:113
+#: models.py:130
 msgid "Used to filter out form submissions."
-msgstr ""
+msgstr "Utilisé pour filtrer les soumissions de formulaire."
 
-#: models.py:116 models.py:297
+#: models.py:133 models.py:311
 msgid "Error message"
-msgstr ""
+msgstr "Message d'erreur"
 
-#: models.py:119
+#: models.py:136
 msgid "An error message that will be displayed if the form doesn't validate."
 msgstr ""
+"Un message d'erreur qui sera affiché si la soumission du formulaire échoue."
 
-#: models.py:123
+#: models.py:140
 msgid "Success message"
-msgstr ""
+msgstr "Message de validation"
 
-#: models.py:126
+#: models.py:143
 msgid "An success message that will be displayed."
-msgstr ""
+msgstr "Un message qui sera affiché lorsque le formulaire sera soumis."
 
-#: models.py:129
+#: models.py:146
 msgid "Redirect to"
-msgstr ""
+msgstr "Rediriger vers"
 
-#: models.py:132
+#: models.py:149
 msgid "Where to redirect the user when the form has been successfully sent?"
-msgstr ""
+msgstr "Où rediriger l'utilisateur lorsque le formulaire a bien été envoyé ?"
 
-#: models.py:138 models.py:285 models.py:331 models.py:444
+#: models.py:155 models.py:298 models.py:345 models.py:459
 msgid "custom css classes"
-msgstr ""
+msgstr "classes CSS personnalisées"
 
-#: models.py:140
+#: models.py:157
 msgid "form template"
-msgstr ""
+msgstr "modèle de formulaire"
 
-#: models.py:149
+#: models.py:166
 msgid "Recipients"
-msgstr ""
+msgstr "Destinataires"
 
-#: models.py:152
+#: models.py:169
 msgid "People who will get the form content via e-mail."
-msgstr ""
+msgstr "Personnes qui recevront le contenu du formulaire par courriel."
 
-#: models.py:283
+#: models.py:296
 msgid "Legend"
-msgstr ""
+msgstr "Légende"
 
-#: models.py:295
+#: models.py:309
 msgid "Field is required"
-msgstr ""
+msgstr "Le champ est requis"
 
-#: models.py:300
+#: models.py:314
 msgid ""
 "Error message displayed if the required field is left empty. Default: \"This"
 " field is required\"."
 msgstr ""
+"Message d'erreur affiché si le champ requis n'est pas rempli. Par défaut : «"
+" Ce champ est requis »."
 
-#: models.py:304
+#: models.py:318
 msgid "Placeholder text"
-msgstr ""
+msgstr "Texte titulaire"
 
-#: models.py:307
+#: models.py:321
 msgid ""
 "Default text in a form. Disappears when user starts typing. Example: "
 "\"email@exmaple.com\""
 msgstr ""
+"Texte affiché en substitut lorsque le champ est vide. Il disparaît lorsque "
+"l'utilisateur commence à taper. Exemple : « email@example.com »"
 
-#: models.py:311
+#: models.py:325
 msgid "Help text"
-msgstr ""
+msgstr "Texte d'aide"
 
-#: models.py:314
+#: models.py:328
 msgid "Explanatory text displayed next to input field. Just like this one."
-msgstr ""
+msgstr "Texte explicatif affiché à côté du champ. Tout comme celui-ci."
 
-#: models.py:321
+#: models.py:335
 msgid "Min value"
-msgstr ""
+msgstr "Valeur minimale"
 
-#: models.py:324
+#: models.py:338
 msgid "Max value"
-msgstr ""
+msgstr "Valeur maximale"
 
-#: models.py:365
+#: models.py:380
 msgid "columns"
-msgstr ""
+msgstr "colonnes"
 
-#: models.py:367
+#: models.py:382
 msgid "rows"
-msgstr ""
+msgstr "lignes"
 
-#: models.py:374
+#: models.py:389
 msgid ""
 "When checked, the value of this field will be used to send an email "
 "notification."
 msgstr ""
+"Si coché, la valeur de ce champ sera utilisée pour envoyer une notification "
+"par courriel."
 
-#: models.py:378
+#: models.py:393
 msgid "email subject"
-msgstr ""
+msgstr "objet du courriel"
 
-#: models.py:382
+#: models.py:397
 msgid "Used as the email subject when email_send_notification is checked."
 msgstr ""
+"Utilisé comme objet du courriel lorsque l'envoi de notification par courriel"
+" est coché."
 
-#: models.py:386
+#: models.py:401
 msgid "Additional email body"
-msgstr ""
+msgstr "Texte supplémentaire du courriel"
 
-#: models.py:389
+#: models.py:404
 msgid "Additional body text used when email notifications are active."
 msgstr ""
+"Texte supplémentaire dans le courriel utilisé lorsque les notifications par "
+"courriel sont activées."
 
-#: models.py:396
+#: models.py:411
 msgid "Upload files to"
-msgstr ""
+msgstr "Téléverser les fichiers dans"
 
-#: models.py:397
+#: models.py:412
 msgid ""
 "Select a folder to which all files submitted through this field will be "
 "uploaded to."
 msgstr ""
+"Sélectionnez un dossier dans lequel tous les fichiers envoyés via ce champ "
+"seront enregistrés."
 
-#: models.py:401
+#: models.py:416
 msgid "Maximum file size"
-msgstr ""
+msgstr "Taille de fichier maximale"
 
-#: models.py:403
+#: models.py:418
 msgid ""
 "The maximum file size of the upload, in bytes. You can use common size "
 "suffixes (kB, MB, GB, ...)."
 msgstr ""
+"La taille de fichier maximale d'un téléversement, en octets. Vous pouvez "
+"utiliser les suffixes courants (kB, MB, GB…)."
 
-#: models.py:417
+#: models.py:432
 msgid "Maximum image width"
-msgstr ""
+msgstr "Largeur maximale de l'image"
 
-#: models.py:419
+#: models.py:434
 msgid "The maximum width of the uploaded image, in pixels."
-msgstr ""
+msgstr "La largeur maximale de l'image téléversée, en pixels."
 
-#: models.py:422
+#: models.py:437
 msgid "Maximum image height"
-msgstr ""
+msgstr "Hauteur maximale de l'image"
 
-#: models.py:424
+#: models.py:439
 msgid "The maximum height of the uploaded image, in pixels."
-msgstr ""
+msgstr "La hauteur maximale de l'image téléversée, en pixels."
 
-#: models.py:454
+#: models.py:470
 msgid "form name"
-msgstr ""
+msgstr "nom du formulaire"
 
-#: models.py:460
+#: models.py:476
 msgid "users notified"
-msgstr ""
+msgstr "utilisateurs notifiés"
 
-#: models.py:462
+#: models.py:478
 msgid "People who got a notification when form was submitted."
 msgstr ""
+"Personnes qui ont reçu une notification lorsque le formulaire a été soumis."
 
-#: models.py:466
+#: models.py:482
 msgid "form language"
-msgstr ""
+msgstr "langue du formulaire"
 
-#: models.py:472
+#: models.py:488
 msgid "form url"
-msgstr ""
+msgstr "URL du formulaire"
 
-#: models.py:480
+#: models.py:496
 msgid "Form submission"
-msgstr ""
+msgstr "Soumission de formulaire"
 
-#: models.py:481
+#: models.py:497
 msgid "Form submissions"
-msgstr ""
+msgstr "Soumissions de formulaire"
 
 #: templates/aldryn_forms/form.html:15
 #, python-format
@@ -598,15 +604,33 @@ msgid ""
 "                <a href=\"%(form_success_url)s\">redirected shortly</a>.\n"
 "            "
 msgstr ""
+"\n"
+"Merci d'avoir soumis vos informations, vous allez être\n"
+"<a href=\"%(form_success_url)s\">redirigé·e dans un instant</a>."
 
 #: validators.py:35
 #, python-format
 msgid ""
 "You have to choose at least %(limit_value)d options (chosen %(show_value)d)."
 msgstr ""
+"Vous devez sélectionner au moins %(limit_value)d options (seulement "
+"%(show_value)d sont sélectionnées)."
 
 #: validators.py:41
 #, python-format
 msgid ""
 "You can't choose more than %(limit_value)d options (chosen %(show_value)d)."
 msgstr ""
+"Vous ne pouvez pas sélectionner plus de %(limit_value)d options "
+"(%(show_value)d sont sélectionnées)."
+
+#~ msgid ""
+#~ "\n"
+#~ "                Please correct the error below."
+#~ msgid_plural ""
+#~ "Please correct the errors below.\n"
+#~ "            "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "Veuillez corriger l'erreur ci-dessous."
+#~ msgstr[1] "Veuillez corriger les erreurs ci-dessous."
diff --git a/aldryn_forms/locale/it/LC_MESSAGES/django.mo b/aldryn_forms/locale/it/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..acf229ba
Binary files /dev/null and b/aldryn_forms/locale/it/LC_MESSAGES/django.mo differ
diff --git a/aldryn_forms/locale/it/LC_MESSAGES/django.po b/aldryn_forms/locale/it/LC_MESSAGES/django.po
index e4d11792..26453dca 100644
--- a/aldryn_forms/locale/it/LC_MESSAGES/django.po
+++ b/aldryn_forms/locale/it/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-15 13:11+0200\n"
+"POT-Creation-Date: 2016-08-24 09:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Italian (https://www.transifex.com/divio/teams/58664/it/)\n"
 "MIME-Version: 1.0\n"
@@ -57,14 +57,14 @@ msgstr ""
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:4
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:4
-#: models.py:294 models.py:442
+#: models.py:308 models.py:457
 #: templates/admin/aldryn_forms/display/submission_data.html:4
 msgid "Label"
 msgstr ""
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:5
 #: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:5
-#: models.py:432 templates/admin/aldryn_forms/display/submission_data.html:5
+#: models.py:447 templates/admin/aldryn_forms/display/submission_data.html:5
 msgid "Value"
 msgstr ""
 
@@ -76,21 +76,19 @@ msgid "Export form submissions"
 msgstr ""
 
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:8
+#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
+#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
 #: templates/admin/aldryn_forms/export.html:8
-msgid ""
-"\n"
-"                Please correct the error below."
-msgid_plural ""
-"Please correct the errors below.\n"
-"            "
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 
-#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:32
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:30
 #: boilerplates/bootstrap3/templates/admin/aldryn_forms/export_wizard.html:11
 #: boilerplates/legacy/templates/admin/aldryn_forms/export.html:27
 #: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:30
-#: templates/admin/aldryn_forms/export.html:32
+#: templates/admin/aldryn_forms/export.html:30
 #: templates/admin/aldryn_forms/export_wizard.html:11
 msgid "Export"
 msgstr ""
@@ -159,86 +157,79 @@ msgid ""
 "href=\"%(form_success_url)s\">redirected shortly</a>."
 msgstr ""
 
-#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
-#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: cms_app.py:9 cms_plugins.py:53
+#: cms_apps.py:9 cms_plugins.py:51
 msgid "Forms"
 msgstr ""
 
-#: cms_plugins.py:62
+#: cms_plugins.py:60
 msgid "Form"
 msgstr ""
 
-#: cms_plugins.py:209
+#: cms_plugins.py:204
 msgid "The form has been sent."
 msgstr ""
 
-#: cms_plugins.py:238
+#: cms_plugins.py:233
 msgid "Fieldset"
 msgstr ""
 
-#: cms_plugins.py:257
+#: cms_plugins.py:252
 msgid "Form fields"
 msgstr ""
 
-#: cms_plugins.py:386
+#: cms_plugins.py:383
 msgid "Advanced Settings"
 msgstr ""
 
-#: cms_plugins.py:423
+#: cms_plugins.py:420
 msgid "Text Field"
 msgstr ""
 
-#: cms_plugins.py:447
+#: cms_plugins.py:444
 msgid "Text Area Field"
 msgstr ""
 
-#: cms_plugins.py:488
+#: cms_plugins.py:485
 msgid "Email Field"
 msgstr ""
 
-#: cms_plugins.py:523
+#: cms_plugins.py:520
 msgid "File upload field"
 msgstr ""
 
-#: cms_plugins.py:603
+#: cms_plugins.py:600
 msgid "Image upload field"
 msgstr ""
 
-#: cms_plugins.py:641
+#: cms_plugins.py:638
 msgid "Yes/No Field"
 msgstr ""
 
-#: cms_plugins.py:662
+#: cms_plugins.py:659
 msgid "Yes"
 msgstr ""
 
-#: cms_plugins.py:662
+#: cms_plugins.py:659
 msgid "No"
 msgstr ""
 
-#: cms_plugins.py:670
+#: cms_plugins.py:667
 msgid "Select Field"
 msgstr ""
 
-#: cms_plugins.py:704
+#: cms_plugins.py:701
 msgid "Multiple Select Field"
 msgstr ""
 
-#: cms_plugins.py:740
+#: cms_plugins.py:737
 msgid "Radio Select Field"
 msgstr ""
 
-#: cms_plugins.py:781
+#: cms_plugins.py:778
 msgid "Captcha Field"
 msgstr ""
 
-#: cms_plugins.py:802
+#: cms_plugins.py:799
 msgid "Submit Button"
 msgstr ""
 
@@ -324,269 +315,254 @@ msgstr ""
 msgid "Fields"
 msgstr ""
 
-#: forms.py:28
-#, python-format
-msgid "File size must be under %s. Current file size is %s."
-msgstr ""
-
-#: forms.py:62
-#, python-format
-msgid "Image width must be under %s pixels. Current width is %s pixels."
-msgstr ""
-
-#: forms.py:67
-#, python-format
-msgid "Image height must be under %s pixels. Current height is %s pixels."
-msgstr ""
-
-#: forms.py:158
+#: forms.py:168
 msgid "Please provide CMS page for redirect."
 msgstr ""
 
-#: forms.py:162
+#: forms.py:172
 msgid "Please provide an absolute URL for redirect."
 msgstr ""
 
-#: forms.py:206
+#: forms.py:216
 msgid "Min value can not be greater then max value."
 msgstr ""
 
-#: forms.py:215
+#: forms.py:225
 msgid "Min length"
 msgstr ""
 
-#: forms.py:216
+#: forms.py:226
 msgid "Required number of characters to type."
 msgstr ""
 
-#: forms.py:218
+#: forms.py:228
 msgid "Max length"
 msgstr ""
 
-#: forms.py:219
+#: forms.py:229
 msgid "Maximum number of characters to type."
 msgstr ""
 
-#: forms.py:254
+#: forms.py:264
 msgid ""
 "Explanatory text displayed next to input field. Just like this one. You can "
 "use MAXSIZE as a placeholder for the maximum size configured below."
 msgstr ""
 
-#: forms.py:267
+#: forms.py:277
 msgid ""
 "Explanatory text displayed next to input field. Just like this one. You can "
 "use MAXSIZE, MAXWIDTH, MAXHEIGHT as a placeholders for the maximum file size"
 " and dimensions configured below."
 msgstr ""
 
-#: forms.py:291
+#: forms.py:301
 msgid "Min choices"
 msgstr ""
 
-#: forms.py:292
+#: forms.py:302
 msgid "Required amount of elements to chose."
 msgstr ""
 
-#: forms.py:294
+#: forms.py:304
 msgid "Max choices"
 msgstr ""
 
-#: forms.py:295
+#: forms.py:305
 msgid "Maximum amount of elements to chose."
 msgstr ""
 
-#: models.py:95 models.py:433
+#: models.py:112 models.py:448
 msgid "Default"
 msgstr ""
 
-#: models.py:103 models.py:135
+#: models.py:120 models.py:152
 msgid "CMS Page"
 msgstr ""
 
-#: models.py:104 models.py:136
+#: models.py:121 models.py:153
 msgid "Absolute URL"
 msgstr ""
 
-#: models.py:111
+#: models.py:128
 msgid "Name"
 msgstr ""
 
-#: models.py:113
+#: models.py:130
 msgid "Used to filter out form submissions."
 msgstr ""
 
-#: models.py:116 models.py:297
+#: models.py:133 models.py:311
 msgid "Error message"
 msgstr ""
 
-#: models.py:119
+#: models.py:136
 msgid "An error message that will be displayed if the form doesn't validate."
 msgstr ""
 
-#: models.py:123
+#: models.py:140
 msgid "Success message"
 msgstr ""
 
-#: models.py:126
+#: models.py:143
 msgid "An success message that will be displayed."
 msgstr ""
 
-#: models.py:129
+#: models.py:146
 msgid "Redirect to"
 msgstr ""
 
-#: models.py:132
+#: models.py:149
 msgid "Where to redirect the user when the form has been successfully sent?"
 msgstr ""
 
-#: models.py:138 models.py:285 models.py:331 models.py:444
+#: models.py:155 models.py:298 models.py:345 models.py:459
 msgid "custom css classes"
 msgstr ""
 
-#: models.py:140
+#: models.py:157
 msgid "form template"
 msgstr ""
 
-#: models.py:149
+#: models.py:166
 msgid "Recipients"
 msgstr ""
 
-#: models.py:152
+#: models.py:169
 msgid "People who will get the form content via e-mail."
 msgstr ""
 
-#: models.py:283
+#: models.py:296
 msgid "Legend"
 msgstr ""
 
-#: models.py:295
+#: models.py:309
 msgid "Field is required"
 msgstr ""
 
-#: models.py:300
+#: models.py:314
 msgid ""
 "Error message displayed if the required field is left empty. Default: \"This"
 " field is required\"."
 msgstr ""
 
-#: models.py:304
+#: models.py:318
 msgid "Placeholder text"
 msgstr ""
 
-#: models.py:307
+#: models.py:321
 msgid ""
 "Default text in a form. Disappears when user starts typing. Example: "
 "\"email@exmaple.com\""
 msgstr ""
 
-#: models.py:311
+#: models.py:325
 msgid "Help text"
 msgstr ""
 
-#: models.py:314
+#: models.py:328
 msgid "Explanatory text displayed next to input field. Just like this one."
 msgstr ""
 
-#: models.py:321
+#: models.py:335
 msgid "Min value"
 msgstr ""
 
-#: models.py:324
+#: models.py:338
 msgid "Max value"
 msgstr ""
 
-#: models.py:365
+#: models.py:380
 msgid "columns"
 msgstr ""
 
-#: models.py:367
+#: models.py:382
 msgid "rows"
 msgstr ""
 
-#: models.py:374
+#: models.py:389
 msgid ""
 "When checked, the value of this field will be used to send an email "
 "notification."
 msgstr ""
 
-#: models.py:378
+#: models.py:393
 msgid "email subject"
 msgstr ""
 
-#: models.py:382
+#: models.py:397
 msgid "Used as the email subject when email_send_notification is checked."
 msgstr ""
 
-#: models.py:386
+#: models.py:401
 msgid "Additional email body"
 msgstr ""
 
-#: models.py:389
+#: models.py:404
 msgid "Additional body text used when email notifications are active."
 msgstr ""
 
-#: models.py:396
+#: models.py:411
 msgid "Upload files to"
 msgstr ""
 
-#: models.py:397
+#: models.py:412
 msgid ""
 "Select a folder to which all files submitted through this field will be "
 "uploaded to."
 msgstr ""
 
-#: models.py:401
+#: models.py:416
 msgid "Maximum file size"
 msgstr ""
 
-#: models.py:403
+#: models.py:418
 msgid ""
 "The maximum file size of the upload, in bytes. You can use common size "
 "suffixes (kB, MB, GB, ...)."
 msgstr ""
 
-#: models.py:417
+#: models.py:432
 msgid "Maximum image width"
 msgstr ""
 
-#: models.py:419
+#: models.py:434
 msgid "The maximum width of the uploaded image, in pixels."
 msgstr ""
 
-#: models.py:422
+#: models.py:437
 msgid "Maximum image height"
 msgstr ""
 
-#: models.py:424
+#: models.py:439
 msgid "The maximum height of the uploaded image, in pixels."
 msgstr ""
 
-#: models.py:454
+#: models.py:470
 msgid "form name"
 msgstr ""
 
-#: models.py:460
+#: models.py:476
 msgid "users notified"
 msgstr ""
 
-#: models.py:462
+#: models.py:478
 msgid "People who got a notification when form was submitted."
 msgstr ""
 
-#: models.py:466
+#: models.py:482
 msgid "form language"
 msgstr ""
 
-#: models.py:472
+#: models.py:488
 msgid "form url"
 msgstr ""
 
-#: models.py:480
+#: models.py:496
 msgid "Form submission"
 msgstr ""
 
-#: models.py:481
+#: models.py:497
 msgid "Form submissions"
 msgstr ""
 
@@ -610,3 +586,12 @@ msgstr ""
 msgid ""
 "You can't choose more than %(limit_value)d options (chosen %(show_value)d)."
 msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "                Please correct the error below."
+#~ msgid_plural ""
+#~ "Please correct the errors below.\n"
+#~ "            "
+#~ msgstr[0] ""
+#~ msgstr[1] ""
diff --git a/aldryn_forms/locale/nl/LC_MESSAGES/django.mo b/aldryn_forms/locale/nl/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..4611f203
Binary files /dev/null and b/aldryn_forms/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/aldryn_forms/locale/nl/LC_MESSAGES/django.po b/aldryn_forms/locale/nl/LC_MESSAGES/django.po
new file mode 100644
index 00000000..395b88cf
--- /dev/null
+++ b/aldryn_forms/locale/nl/LC_MESSAGES/django.po
@@ -0,0 +1,639 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# kurdyma <transifex.com@kurdyenviolien.nl>, 2016
+# Angelo Dini <finalangeljp@hotmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-24 09:03-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Angelo Dini <finalangeljp@hotmail.com>, 2016\n"
+"Language-Team: Dutch (https://www.transifex.com/divio/teams/58664/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/base.py:39
+msgid "data"
+msgstr "data"
+
+#: admin/base.py:55
+msgid "people notified"
+msgstr "mensen die op de hoogte zijn gesteld"
+
+#: admin/forms.py:33
+msgid "from date"
+msgstr "van datum"
+
+#: admin/forms.py:38
+msgid "to date"
+msgstr "tot datum"
+
+#: admin/forms.py:43
+msgid "language"
+msgstr "taal"
+
+#: admin/forms.py:58
+msgid ""
+"Export failed! More then 65,536 entries found, exceeded Excel limitation!"
+msgstr ""
+"Export is mislukt! Meer dan 65.536 regels gevonden; dit is meer dan  Excel's"
+" limiet."
+
+#: admin/forms.py:132
+msgid "Please select at least one field to export."
+msgstr "Selecteer in ieder geval 1 veld om te exporteren."
+
+#: admin/views.py:69
+msgid "No records found"
+msgstr "Geen records gevonden"
+
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:3
+#: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:3
+#: templates/admin/aldryn_forms/display/submission_data.html:3
+msgid "Field"
+msgstr "Veld"
+
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:4
+#: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:4
+#: models.py:308 models.py:457
+#: templates/admin/aldryn_forms/display/submission_data.html:4
+msgid "Label"
+msgstr "Label"
+
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/display/submission_data.html:5
+#: boilerplates/legacy/templates/admin/aldryn_forms/display/submission_data.html:5
+#: models.py:447 templates/admin/aldryn_forms/display/submission_data.html:5
+msgid "Value"
+msgstr "Waarde"
+
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:5
+#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:4
+#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:4
+#: templates/admin/aldryn_forms/export.html:5
+msgid "Export form submissions"
+msgstr "Exporteer formulier inzendingen"
+
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:8
+#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:7
+#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:7
+#: templates/admin/aldryn_forms/export.html:8
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Verbeter de fout hieronder."
+msgstr[1] "Verbeter de fouten hieronder."
+
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export.html:30
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export_wizard.html:11
+#: boilerplates/legacy/templates/admin/aldryn_forms/export.html:27
+#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:30
+#: templates/admin/aldryn_forms/export.html:30
+#: templates/admin/aldryn_forms/export_wizard.html:11
+msgid "Export"
+msgstr "Exporteer"
+
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/export_wizard.html:13
+#: boilerplates/legacy/templates/admin/aldryn_forms/export_wizard.html:32
+#: templates/admin/aldryn_forms/export_wizard.html:13
+msgid "Continue"
+msgstr "Ga door"
+
+#: boilerplates/bootstrap3/templates/admin/aldryn_forms/formsubmission/change_list.html:9
+#: boilerplates/legacy/templates/admin/aldryn_forms/formsubmission/change_list.html:9
+#: templates/admin/aldryn_forms/formsubmission/change_list.html:9
+msgid "Export Form Entries"
+msgstr "Exporteer formulier inzendingen"
+
+#: boilerplates/bootstrap3/templates/aldryn_forms/email_notifications/emails/notification.body.html:9
+#: boilerplates/bootstrap3/templates/aldryn_forms/email_notifications/emails/notification.body.txt:8
+#: boilerplates/bootstrap3/templates/aldryn_forms/emails/notification.body.html:3
+#: boilerplates/bootstrap3/templates/aldryn_forms/emails/notification.body.txt:2
+#: boilerplates/bootstrap3/templates/aldryn_forms/emails/user/notification.body.txt:5
+#: boilerplates/legacy/templates/aldryn_forms/email_notifications/emails/notification.body.html:9
+#: boilerplates/legacy/templates/aldryn_forms/email_notifications/emails/notification.body.txt:8
+#: boilerplates/legacy/templates/aldryn_forms/emails/notification.body.html:3
+#: boilerplates/legacy/templates/aldryn_forms/emails/notification.body.txt:2
+#: boilerplates/legacy/templates/aldryn_forms/emails/user/notification.body.txt:5
+#: templates/aldryn_forms/email_notifications/emails/notification.body.html:9
+#: templates/aldryn_forms/email_notifications/emails/notification.body.txt:8
+#: templates/aldryn_forms/emails/notification.body.html:3
+#: templates/aldryn_forms/emails/notification.body.txt:2
+#: templates/aldryn_forms/emails/user/notification.body.txt:5
+#, python-format
+msgid "Form name: %(form_name)s"
+msgstr "Formuliernaam: %(form_name)s"
+
+#: boilerplates/bootstrap3/templates/aldryn_forms/email_notifications/emails/notification.subject.txt:1
+#: boilerplates/bootstrap3/templates/aldryn_forms/emails/notification.subject.txt:1
+#: boilerplates/bootstrap3/templates/aldryn_forms/emails/user/notification.subject.txt:1
+#: boilerplates/legacy/templates/aldryn_forms/email_notifications/emails/notification.subject.txt:1
+#: boilerplates/legacy/templates/aldryn_forms/emails/notification.subject.txt:1
+#: boilerplates/legacy/templates/aldryn_forms/emails/user/notification.subject.txt:1
+#: templates/aldryn_forms/email_notifications/emails/notification.subject.txt:1
+#: templates/aldryn_forms/emails/notification.subject.txt:1
+#: templates/aldryn_forms/emails/user/notification.subject.txt:1
+#, python-format
+msgid "[Form submission] %(form_name)s"
+msgstr "[Formulier inzending] %(form_name)s"
+
+#: boilerplates/bootstrap3/templates/aldryn_forms/field.html:7
+#: boilerplates/bootstrap3/templates/aldryn_forms/fields/emailfield.html:9
+#: boilerplates/bootstrap3/templates/aldryn_forms/fields/filefield.html:9
+#: boilerplates/bootstrap3/templates/aldryn_forms/fields/imagefield.html:9
+#: boilerplates/bootstrap3/templates/aldryn_forms/fields/multipleselectfield.html:9
+#: boilerplates/bootstrap3/templates/aldryn_forms/fields/radioselectfield.html:8
+#: boilerplates/bootstrap3/templates/aldryn_forms/fields/selectfield.html:9
+#: boilerplates/bootstrap3/templates/aldryn_forms/fields/textareafield.html:9
+#: boilerplates/bootstrap3/templates/aldryn_forms/fields/textfield.html:9
+#: templates/aldryn_forms/field.html:14
+msgid "Required field"
+msgstr "Verplicht veld"
+
+#: boilerplates/bootstrap3/templates/aldryn_forms/form.html:19
+#, python-format
+msgid ""
+"Thank you for submitting your information, you will be <a "
+"href=\"%(form_success_url)s\">redirected shortly</a>."
+msgstr ""
+"Dank u voor het verzenden van uw informatie. U wordt spoedig <a "
+"href=\"%(form_success_url)s\">doorgeleid</a>."
+
+#: cms_apps.py:9 cms_plugins.py:51
+msgid "Forms"
+msgstr "Formulieren"
+
+#: cms_plugins.py:60
+msgid "Form"
+msgstr "Formulier"
+
+#: cms_plugins.py:204
+msgid "The form has been sent."
+msgstr "Het formulier is verzonden."
+
+#: cms_plugins.py:233
+msgid "Fieldset"
+msgstr "Fieldset"
+
+#: cms_plugins.py:252
+msgid "Form fields"
+msgstr "Formulier velden"
+
+#: cms_plugins.py:383
+msgid "Advanced Settings"
+msgstr "Geavanceerde Settings"
+
+#: cms_plugins.py:420
+msgid "Text Field"
+msgstr "Tekst Veld"
+
+#: cms_plugins.py:444
+msgid "Text Area Field"
+msgstr "Text Area Veld"
+
+#: cms_plugins.py:485
+msgid "Email Field"
+msgstr "Email Veld"
+
+#: cms_plugins.py:520
+msgid "File upload field"
+msgstr "Bestand upload veld"
+
+#: cms_plugins.py:600
+msgid "Image upload field"
+msgstr "Afbeelding upload veld"
+
+#: cms_plugins.py:638
+msgid "Yes/No Field"
+msgstr "Ja/Nee Veld"
+
+#: cms_plugins.py:659
+msgid "Yes"
+msgstr "Ja"
+
+#: cms_plugins.py:659
+msgid "No"
+msgstr "Nee"
+
+#: cms_plugins.py:667
+msgid "Select Field"
+msgstr "Select Veld"
+
+#: cms_plugins.py:701
+msgid "Multiple Select Field"
+msgstr "Multiple Select Veld"
+
+#: cms_plugins.py:737
+msgid "Radio Select Field"
+msgstr "Radio Select Veld"
+
+#: cms_plugins.py:778
+msgid "Captcha Field"
+msgstr "Captcha Veld"
+
+#: cms_plugins.py:799
+msgid "Submit Button"
+msgstr "Verzend Knop"
+
+#: contrib/email_notifications/cms_plugins.py:26
+msgid "new email notification"
+msgstr "nieuw email bericht"
+
+#: contrib/email_notifications/cms_plugins.py:27
+msgid "new email notifications"
+msgstr "nieuwe email berichten"
+
+#: contrib/email_notifications/cms_plugins.py:63
+#, python-brace-format
+msgid ""
+"variables can be used with by wrapping with \"${variable}\" like ${variable}"
+msgstr ""
+"variabelen kunnen gebruikt worden door \"${variable}\" er omheen te zetten, "
+"zoals ${variable}"
+
+#: contrib/email_notifications/cms_plugins.py:117
+msgid "available text variables"
+msgstr "beschikbare tekst variabelen"
+
+#: contrib/email_notifications/cms_plugins.py:121
+msgid "Form (Advanced)"
+msgstr "Formulier (Geavanceerd)"
+
+#: contrib/email_notifications/models.py:28
+msgid "default"
+msgstr "default"
+
+#: contrib/email_notifications/models.py:61
+msgid "theme"
+msgstr "thema"
+
+#: contrib/email_notifications/models.py:63
+msgid "Provides the base theme for the email."
+msgstr "Verschaft het basis thema voor de email."
+
+#: contrib/email_notifications/models.py:67
+msgid "to name"
+msgstr "'aan' naam"
+
+#: contrib/email_notifications/models.py:72
+msgid "to email"
+msgstr "'aan' email"
+
+#: contrib/email_notifications/models.py:78
+msgid "to user"
+msgstr "'aan' gebruiker"
+
+#: contrib/email_notifications/models.py:84
+msgid "from name"
+msgstr "'van' naam"
+
+#: contrib/email_notifications/models.py:89
+msgid "from email"
+msgstr "'van' email"
+
+#: contrib/email_notifications/models.py:94
+msgid "subject"
+msgstr "onderwerp"
+
+#: contrib/email_notifications/models.py:99
+msgid "email body (txt)"
+msgstr "email body (txt)"
+
+#: contrib/email_notifications/models.py:101
+msgid "used when rendering the email in text only mode."
+msgstr "gebruikt als de email in tekst mode wordt gemaakt."
+
+#: contrib/email_notifications/models.py:104
+msgid "email body (html)"
+msgstr "email body (html)"
+
+#: contrib/email_notifications/models.py:106
+msgid "used when rendering the email in html."
+msgstr "gebruikt als de email in html mode wordt gemaakt."
+
+#: contrib/email_notifications/models.py:122
+msgid "Please provide a recipient."
+msgstr "Geef een ontvanger op."
+
+#: contrib/email_notifications/notification.py:54
+msgid "Fields"
+msgstr "Velden"
+
+#: forms.py:168
+msgid "Please provide CMS page for redirect."
+msgstr "Geef een CMS pagina op voor redirect."
+
+#: forms.py:172
+msgid "Please provide an absolute URL for redirect."
+msgstr "Geef een absolute URL op voor redirect"
+
+#: forms.py:216
+msgid "Min value can not be greater then max value."
+msgstr "Min waarde kan niet groter zijn dan max waarde."
+
+#: forms.py:225
+msgid "Min length"
+msgstr "Min lengte"
+
+#: forms.py:226
+msgid "Required number of characters to type."
+msgstr "Benodigd aantal in te typen karakters."
+
+#: forms.py:228
+msgid "Max length"
+msgstr "Max lengte"
+
+#: forms.py:229
+msgid "Maximum number of characters to type."
+msgstr "Maximaal benodigd aantal in te typen karakters."
+
+#: forms.py:264
+msgid ""
+"Explanatory text displayed next to input field. Just like this one. You can "
+"use MAXSIZE as a placeholder for the maximum size configured below."
+msgstr ""
+"Uitleg die wordt getoond naast het veld. Net zo als deze tekst. Je kunt "
+"MAXSIZE gebruiken als placeholder voor de maximum grootte zoals hieronder "
+"geconfigureerd."
+
+#: forms.py:277
+msgid ""
+"Explanatory text displayed next to input field. Just like this one. You can "
+"use MAXSIZE, MAXWIDTH, MAXHEIGHT as a placeholders for the maximum file size"
+" and dimensions configured below."
+msgstr ""
+"Uitleg die wordt getoond naast het input veld. Net zo als deze tekst. Je "
+"kunt MAXSIZE, MAXWIDTH, MAXHEIGHT gebruiken als placeholder voor de maximum "
+"bestandsgrootte en dimansies zoals hieronder geconfigureerd."
+
+#: forms.py:301
+msgid "Min choices"
+msgstr "Min keuzes"
+
+#: forms.py:302
+msgid "Required amount of elements to chose."
+msgstr "Benodigde aantal elementen om te kiezen."
+
+#: forms.py:304
+msgid "Max choices"
+msgstr "Max keuzes"
+
+#: forms.py:305
+msgid "Maximum amount of elements to chose."
+msgstr "Maximale aantal elementen om te kiezen."
+
+#: models.py:112 models.py:448
+msgid "Default"
+msgstr "Default"
+
+#: models.py:120 models.py:152
+msgid "CMS Page"
+msgstr "CMS Pagina"
+
+#: models.py:121 models.py:153
+msgid "Absolute URL"
+msgstr "Absolute URL"
+
+#: models.py:128
+msgid "Name"
+msgstr "Naam"
+
+#: models.py:130
+msgid "Used to filter out form submissions."
+msgstr "Gebruikt om formulier inzendingen uit te filteren."
+
+#: models.py:133 models.py:311
+msgid "Error message"
+msgstr "Foutboodschap"
+
+#: models.py:136
+msgid "An error message that will be displayed if the form doesn't validate."
+msgstr ""
+"Een foutboodschap die wordt getoond als het formulier niet gevalideerd kan "
+"worden."
+
+#: models.py:140
+msgid "Success message"
+msgstr "Succesboodschap"
+
+#: models.py:143
+msgid "An success message that will be displayed."
+msgstr "Een succesboodschap die wordt getoond."
+
+#: models.py:146
+msgid "Redirect to"
+msgstr "Redirect naar"
+
+#: models.py:149
+msgid "Where to redirect the user when the form has been successfully sent?"
+msgstr ""
+"Waarheen moet de gebruiker worden geredirect als het formulier succesvol "
+"verzonden is?"
+
+#: models.py:155 models.py:298 models.py:345 models.py:459
+msgid "custom css classes"
+msgstr "custom css classes"
+
+#: models.py:157
+msgid "form template"
+msgstr "formulier template"
+
+#: models.py:166
+msgid "Recipients"
+msgstr "Ontvangers"
+
+#: models.py:169
+msgid "People who will get the form content via e-mail."
+msgstr "Mensen die de inhoud van het formulier krijgen via e-mail."
+
+#: models.py:296
+msgid "Legend"
+msgstr "Legenda"
+
+#: models.py:309
+msgid "Field is required"
+msgstr "Veld is verplicht"
+
+#: models.py:314
+msgid ""
+"Error message displayed if the required field is left empty. Default: \"This"
+" field is required\"."
+msgstr ""
+"Foutboodschap die wordt getoond als een verplicht veld leeggelaten wordt. "
+"Default: \"This field is required\"."
+
+#: models.py:318
+msgid "Placeholder text"
+msgstr "Placeholder tekst"
+
+#: models.py:321
+msgid ""
+"Default text in a form. Disappears when user starts typing. Example: "
+"\"email@exmaple.com\""
+msgstr ""
+"Default tekst in een formulier, de z.g.n. placeholder. Verdwijnt als de "
+"gebruiker begint te typen. Voorbeeld: \"email@example.com\""
+
+#: models.py:325
+msgid "Help text"
+msgstr "Help tekst"
+
+#: models.py:328
+msgid "Explanatory text displayed next to input field. Just like this one."
+msgstr ""
+"Uitleg die wordt getoond naast het input veld. Net zo als deze tekst. "
+
+#: models.py:335
+msgid "Min value"
+msgstr "Min waarde"
+
+#: models.py:338
+msgid "Max value"
+msgstr "Max waarde"
+
+#: models.py:380
+msgid "columns"
+msgstr "kolommen"
+
+#: models.py:382
+msgid "rows"
+msgstr "rijen"
+
+#: models.py:389
+msgid ""
+"When checked, the value of this field will be used to send an email "
+"notification."
+msgstr ""
+"Als dit is aangevinkt, zal de waarde van dit veld worden gebruikt om een "
+"e-mail notificatie te zenden."
+
+#: models.py:393
+msgid "email subject"
+msgstr "email onderwerp"
+
+#: models.py:397
+msgid "Used as the email subject when email_send_notification is checked."
+msgstr ""
+"Gebruikt als email onderwerp als \"email verzonden notificatie\" is "
+"aangevinkt."
+
+#: models.py:401
+msgid "Additional email body"
+msgstr "Additionele email body"
+
+#: models.py:404
+msgid "Additional body text used when email notifications are active."
+msgstr "Additionele email body als email notificaties actief zijn"
+
+#: models.py:411
+msgid "Upload files to"
+msgstr "Upload bestanden naar"
+
+#: models.py:412
+msgid ""
+"Select a folder to which all files submitted through this field will be "
+"uploaded to."
+msgstr ""
+"Selecteer een folder waarheen alle bestanden in dit veld worden geupload."
+
+#: models.py:416
+msgid "Maximum file size"
+msgstr "Maximum bestandsgrootte"
+
+#: models.py:418
+msgid ""
+"The maximum file size of the upload, in bytes. You can use common size "
+"suffixes (kB, MB, GB, ...)."
+msgstr ""
+"De maximum bestandsgrootte van de upload, in bytes, U kunt bekende "
+"achtervoegsels gebruiken (kB, MB, GB, ...)."
+
+#: models.py:432
+msgid "Maximum image width"
+msgstr "Maximale afbeeldingsbreedte"
+
+#: models.py:434
+msgid "The maximum width of the uploaded image, in pixels."
+msgstr "De maximale breedte van de geuploade afbeeldingen, in pixels."
+
+#: models.py:437
+msgid "Maximum image height"
+msgstr "Maximale afbeeldingshoogte"
+
+#: models.py:439
+msgid "The maximum height of the uploaded image, in pixels."
+msgstr "De maximale hoogte van de geuploade afbeeldingen, in pixels."
+
+#: models.py:470
+msgid "form name"
+msgstr "formulier naam"
+
+#: models.py:476
+msgid "users notified"
+msgstr "op de hoogte gestelde gebruikers"
+
+#: models.py:478
+msgid "People who got a notification when form was submitted."
+msgstr ""
+"Mensen die op de hoogte worden gesteld als een formulier verzonden wordt."
+
+#: models.py:482
+msgid "form language"
+msgstr "formulier taal"
+
+#: models.py:488
+msgid "form url"
+msgstr "formulier url"
+
+#: models.py:496
+msgid "Form submission"
+msgstr "Formulier verzending"
+
+#: models.py:497
+msgid "Form submissions"
+msgstr "Formulier verzendingen"
+
+#: templates/aldryn_forms/form.html:15
+#, python-format
+msgid ""
+"\n"
+"                Thank you for submitting your information, you will be\n"
+"                <a href=\"%(form_success_url)s\">redirected shortly</a>.\n"
+"            "
+msgstr ""
+"\n"
+"Bedankt voor het verzenden van de informatie, u wordt\n"
+"<a href=\"%(form_success_url)s\">spoedig doorgeleid</a>"
+
+#: validators.py:35
+#, python-format
+msgid ""
+"You have to choose at least %(limit_value)d options (chosen %(show_value)d)."
+msgstr ""
+"U moet minstens %(limit_value)d opties kiezen (gekozen %(show_value)d)."
+
+#: validators.py:41
+#, python-format
+msgid ""
+"You can't choose more than %(limit_value)d options (chosen %(show_value)d)."
+msgstr ""
+"U kunt niet meer dan %(limit_value)d opties kiezen (gekozen %(show_value)d)."
+
+#~ msgid ""
+#~ "\n"
+#~ "                Please correct the error below."
+#~ msgid_plural ""
+#~ "Please correct the errors below.\n"
+#~ "            "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "                Verbeter de fouten hieronder."
+#~ msgstr[1] ""
+#~ "Verbeter de fouten hieronder.\n"
+#~ "            "
diff --git a/aldryn_forms/models.py b/aldryn_forms/models.py
index b2749f6d..04ca61c8 100644
--- a/aldryn_forms/models.py
+++ b/aldryn_forms/models.py
@@ -2,7 +2,6 @@
 from functools import partial
 import json
 from collections import defaultdict, namedtuple
-from distutils.version import LooseVersion
 
 from django.conf import settings
 from django.core.validators import MaxValueValidator
@@ -16,7 +15,6 @@
 except ImportError:
     from collections import OrderedDict as SortedDict
 
-import cms
 from cms.models.fields import PageField
 from cms.models.pluginmodel import CMSPlugin
 from cms.utils.plugins import build_plugin_tree, downcast_plugins
@@ -29,7 +27,6 @@
 from .helpers import is_form_element
 
 
-CMS_31 = LooseVersion(cms.__version__) >= LooseVersion('3.1')
 AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 
 
@@ -269,13 +266,7 @@ def get_form_elements(self):
         from .utils import get_nested_plugins
 
         if self.child_plugin_instances is None:
-            # 3.1 and 3.0 compatibility
-            if CMS_31:
-                # default ordering is by path
-                ordering = ('path',)
-            else:
-                ordering = ('tree_id', 'level', 'position')
-
+            ordering = ('tree_id', 'level', 'position')
             descendants = self.get_descendants().order_by(*ordering)
             # Set parent_id to None in order to
             # fool the build_plugin_tree function.
diff --git a/aldryn_forms/utils.py b/aldryn_forms/utils.py
index a1cab18a..9b88be6b 100644
--- a/aldryn_forms/utils.py
+++ b/aldryn_forms/utils.py
@@ -2,10 +2,7 @@
 from django.forms.forms import NON_FIELD_ERRORS
 
 from cms.utils.moderator import get_cmsplugin_queryset
-try:
-    from cms.utils.plugins import downcast_plugins, build_plugin_tree
-except ImportError:
-    from cms.plugins.utils import downcast_plugins, build_plugin_tree
+from cms.utils.plugins import downcast_plugins, build_plugin_tree
 
 
 def get_user_model():
diff --git a/setup.py b/setup.py
index 9437e93b..39181c10 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from aldryn_forms import __version__
 
 REQUIREMENTS = [
-    'django-cms>=3.0',
+    'django-cms>=3.2',
     'django-emailit',
     'djangocms-text-ckeditor',
     'django-simple-captcha',
diff --git a/updatetranslations.sh b/updatetranslations.sh
new file mode 100755
index 00000000..3727c8cb
--- /dev/null
+++ b/updatetranslations.sh
@@ -0,0 +1,6 @@
+cd aldryn_forms
+django-admin.py makemessages -l en
+tx push -s -l en
+tx pull -f -a
+django-admin.py compilemessages
+