Merge branch '5.9' into 5

lang/de_DE.yml

@@ -1,4 +1,12 @@
 de_DE:
+  EditableFormField:
+    php:
+      SilverStripe\UserForms\Model\EditableFormFieldTYPE_EMPTY: 'Wähle Feld-Typ'
+  EditableTextField:
+    php:
+      SilverStripe\UserForms\Model\EditableFormField\EditableTextFieldMINMAXLENGTHCHECK: 'Minimale Länge sollte kleiner als maximale Länge sein'
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Ordner für den Upload auswählen'
   SilverStripe\UserForms:
     ADDEMAILRECIPIENT: 'E-Mail-Empfänger hinzufügen'
     CLEARBUTTON: Löschen
@@ -56,7 +64,6 @@ de_DE:
     SINGULARNAME: 'Editierbares Formularfeld'
     TITLE: Titel
     TYPE: Typ
-    TYPE_EMPTY: 'Wähle Feld-Typ'
     VALIDATION: Validierung
     'YES': Ja
   SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
@@ -130,7 +137,6 @@ de_DE:
     AUTOCOMPLETE: Auto-Vervollständigung
     MAX_LENGTH: 'Maximale Textlänge'
     MIN_LENGTH: 'Minimale Textlänge'
-    MINMAXLENGTHCHECK: 'Minimale Länge sollte kleiner als maximale Länge sein'
     NUMBERROWS: 'Anzahl der Zeilen'
     NUMBERROWS_DESCRIPTION: 'Felder mit mehr als einer Zeile werden als Text-Area generiert'
     PLURALNAME: Textfelder

lang/en.yml

@@ -1,4 +1,6 @@
 en:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Select upload folder'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Main
   SilverStripe\UserForms:
@@ -19,7 +21,7 @@ en:
     TEXTONCLEAR: 'Text on clear button:'
     TEXTONSUBMIT: 'Text on submit button:'
   SilverStripe\UserForms\Control\UserDefinedFormAdmin:
-    CANCEL: 'Cancel'
+    CANCEL: Cancel
     CONFIRM_FOLDER_LABEL_A: 'Files that your users upload should be stored carefully to reduce the risk of exposing sensitive data. Ensure the folder you select can only be viewed by appropriate parties. Folder permissions can be managed within the Files area.'
     CONFIRM_FOLDER_LABEL_B: 'The folder selected will become the default for this form. This can be changed on an individual basis in the <i>File upload field.</i>'
     FOLDER_OPTIONS_EXISTING: 'Use an existing folder'
@@ -215,8 +217,8 @@ en:
     AUTOCOMPLETE: Autocomplete
     AUTOCOMPLETE_DESCRIPTION: 'Supported browsers will attempt to populate this field automatically with the users information, use to set the value populated'
     MAX_LENGTH: 'Maximum text length'
-    MIN_LENGTH: 'Minimum text length'
     MINMAXLENGTHCHECK: 'Minimum length should be less than the Maximum length.'
+    MIN_LENGTH: 'Minimum text length'
     NUMBERROWS: 'Number of rows'
     NUMBERROWS_DESCRIPTION: 'Fields with more than one row will be generated as a textarea'
     PLURALNAME: 'Text Fields'
@@ -251,11 +253,11 @@ en:
       other: '{count} Submitted File Fields'
     SINGULARNAME: 'Submitted File Field'
   SilverStripe\UserForms\Model\Submission\SubmittedForm:
-    PLURALNAME: 'Submitted forms'
+    PLURALNAME: 'Submitted Forms'
     PLURALS:
-      one: 'A Submitted form'
+      one: 'A Submitted Form'
-      other: '{count} Submitted forms'
+      other: '{count} Submitted Forms'
-    SINGULARNAME: 'Submitted form'
+    SINGULARNAME: 'Submitted Form'
     SUBMITTER: Submitter
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
     PLURALNAME: 'Submitted Form Fields'

lang/eo.yml

@@ -1,4 +1,12 @@
 eo:
+  EditableFormField:
+    php:
+      SilverStripe\UserForms\Model\EditableFormFieldTYPE_EMPTY: 'Elekti tipon de kampo'
+  EditableTextField:
+    php:
+      SilverStripe\UserForms\Model\EditableFormField\EditableTextFieldMINMAXLENGTHCHECK: 'La minimuma longo devus esti malpli ol la maksimuma longo.'
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Elekti alŝutan dosierujon'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Ĉefa
   SilverStripe\UserForms:
@@ -81,7 +89,6 @@ eo:
     SINGULARNAME: 'Redaktebla formulara kampo'
     TITLE: Titolo
     TYPE: Tipo
-    TYPE_EMPTY: 'Elekti tipon de kampo'
     VALIDATION: Validigo
     'YES': Jes
   SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
@@ -215,7 +222,6 @@ eo:
     AUTOCOMPLETE_DESCRIPTION: 'Subtenataj TTT-legiloj provos aŭtomate plenigi ĉi tiun kampon per uzantinformo, uzu ĝin por agordi la enan valoron'
     MAX_LENGTH: 'Maksimuma longo de teksto'
     MIN_LENGTH: 'Minimuma longo de teksto'
-    MINMAXLENGTHCHECK: 'La minimuma longo devus esti malpli ol la maksimuma longo.'
     NUMBERROWS: 'Nombro da vicoj'
     NUMBERROWS_DESCRIPTION: 'Kampoj kun pli ol unu vico generiĝos kiel tekstareo'
     PLURALNAME: 'Tekstaj kampoj'