diff --git a/inc/form_language.class.php b/inc/form_language.class.php
index 29c692f21..bc5e3f517 100644
--- a/inc/form_language.class.php
+++ b/inc/form_language.class.php
@@ -364,7 +364,7 @@ public function showTranslations($options = []) {
$header = '
';
$header.= '' . Html::getCheckAllAsCheckbox("translation_list$rand", $rand) . ' | ';
$header.= '' . __('Original string', 'formcreator') . ' | ';
- $header.= '' . __('Translation', 'Translations', 1, 'formcreator') . ' | ';
+ $header.= '' . _n('Translation', 'Translations', 1, 'formcreator') . ' | ';
$header.= '
';
echo $header;
echo '';
diff --git a/inc/notificationtargetformanswer.class.php b/inc/notificationtargetformanswer.class.php
index 68b823ad0..cca038c8a 100644
--- a/inc/notificationtargetformanswer.class.php
+++ b/inc/notificationtargetformanswer.class.php
@@ -73,8 +73,8 @@ public function addDataForTemplate($event, $options = []) {
$this->data['##lang.formcreator.form_id##'] = __('Form ID', 'formcreator');
$this->data['##lang.formcreator.form_name##'] = __('Form name', 'formcreator');
- $this->data['##lang.formcreator.form_requester##'] = __('Requester', 'formcreator');
- $this->data['##lang.formcreator.form_validator##'] = __('Validator', 'formcreator');
+ $this->data['##lang.formcreator.form_requester##'] = _n('Requester', 'Requesters', 1);
+ $this->data['##lang.formcreator.form_validator##'] = PluginFormcreatorForm_Validator::getTypeName(1);
$this->data['##lang.formcreator.form_creation_date##'] = __('Creation date', 'formcreator');
$this->data['##lang.formcreator.form_full_answers##'] = __('Full form answers', 'formcreator');
$this->data['##lang.formcreator.validation_comment##'] = __('Validation comment', 'formcreator');
diff --git a/locales/en_GB.po b/locales/en_GB.po
index fe23daa9f..d9e16f6e6 100644
--- a/locales/en_GB.po
+++ b/locales/en_GB.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: glpi 100a\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-30 09:32+0200\n"
-"PO-Revision-Date: 2023-05-30 09:32+0200\n"
+"POT-Creation-Date: 2023-08-25 11:18+0200\n"
+"PO-Revision-Date: 2023-08-25 11:18+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en_GB\n"
@@ -108,7 +108,7 @@ msgstr "Could not update the section"
#: front/wizardreminders.php:49 front/wizardreminders.php:51
#: front/wizard.php:45 front/wizard.php:50 front/wizardfeeds.php:49
#: front/wizardfeeds.php:51 front/issue.php:44 front/issue.php:50
-#: front/formanswer.php:44 front/reservation.php:46 front/reservation.php:48
+#: front/formanswer.php:46 front/reservation.php:46 front/reservation.php:48
#: front/knowbaseitem.form.php:48 front/knowbaseitem.form.php:50
#: front/reservationitem.php:42 front/reservationitem.php:44
#: front/formanswer.form.php:74 front/reservation.form.php:46
@@ -131,7 +131,7 @@ msgid "Bad request while deleting an actor."
msgstr "Bad request while deleting an actor."
#: front/targetticket.form.php:95 front/targetchange.form.php:81
-#: front/formanswer.php:47 front/targetproblem.form.php:81
+#: front/formanswer.php:49 front/targetproblem.form.php:81
#: front/formanswer.form.php:77 front/form.php:44 inc/common.class.php:692
#: inc/common.class.php:699
msgid "Form Creator"
@@ -177,11 +177,11 @@ msgstr "See all"
msgid "Please, describe your need here"
msgstr "Please, describe your need here"
-#: inc/field/textareafield.class.php:185
+#: inc/field/textareafield.class.php:175
msgid "Textarea"
msgstr "Textarea"
-#: inc/field/textareafield.class.php:248 inc/field/dropdownfield.class.php:441
+#: inc/field/textareafield.class.php:238 inc/field/dropdownfield.class.php:435
#: inc/field/ldapselectfield.class.php:114 inc/field/textfield.class.php:125
#: inc/field/urgencyfield.class.php:165 inc/field/tagfield.class.php:163
#: inc/field/timefield.class.php:113 inc/field/fieldsfield.class.php:488
@@ -189,41 +189,41 @@ msgstr "Textarea"
msgid "A required field is empty:"
msgstr "A required field is empty:"
-#: inc/field/textareafield.class.php:266 inc/field/textfield.class.php:178
-#: inc/field/integerfield.class.php:112 inc/field/floatfield.class.php:193
+#: inc/field/textareafield.class.php:256 inc/field/textfield.class.php:178
+#: inc/field/integerfield.class.php:82 inc/field/floatfield.class.php:197
#: inc/conditionnabletrait.class.php:70
msgid "The regular expression is invalid"
msgstr "The regular expression is invalid"
-#: inc/field/dropdownfield.class.php:76 inc/filter/entityfilter.class.php:48
+#: inc/field/dropdownfield.class.php:78 inc/filter/entityfilter.class.php:48
msgid "User and form"
msgstr "User and form"
-#: inc/field/dropdownfield.class.php:432 entrée standard:38
+#: inc/field/dropdownfield.class.php:426 entrée standard:38
msgid "Dropdown"
msgid_plural "Dropdowns"
msgstr[0] "Dropdown"
msgstr[1] "Dropdowns"
-#: inc/field/dropdownfield.class.php:463
+#: inc/field/dropdownfield.class.php:457
msgid "Invalid value for "
msgstr "Invalid value for "
-#: inc/field/dropdownfield.class.php:475
+#: inc/field/dropdownfield.class.php:469
#, php-format
msgid "The itemtype field is required: %s"
msgstr "The itemtype field is required: %s"
-#: inc/field/dropdownfield.class.php:491
+#: inc/field/dropdownfield.class.php:485
#, php-format
msgid "Invalid dropdown type: %s"
msgstr "Invalid dropdown type: %s"
-#: inc/field/dropdownfield.class.php:822 entrée standard:162 standard:134
+#: inc/field/dropdownfield.class.php:812 entrée standard:162 standard:134
msgid "Entity restriction"
msgstr "Entity restriction"
-#: inc/field/dropdownfield.class.php:831
+#: inc/field/dropdownfield.class.php:821
msgid ""
"To respect the GLPI entity system, \"Form\" should be selected. Others "
"settings will break the entity restrictions"
@@ -243,8 +243,7 @@ msgstr "LDAP directory not defined!"
msgid "LDAP directory not found!"
msgstr "LDAP directory not found!"
-#: inc/field/textfield.class.php:146 inc/field/integerfield.class.php:71
-#: inc/field/floatfield.class.php:155
+#: inc/field/textfield.class.php:146 inc/field/floatfield.class.php:156
#, php-format
msgid "Specific format does not match: %s"
msgstr "Specific format does not match: %s"
@@ -263,52 +262,53 @@ msgstr "The text is too long (maximum %d characters): %s"
msgid "Text"
msgstr "Text"
-#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:234
+#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:238
#: inc/questionregex.class.php:62 entrée standard:42
msgid "Regular expression"
msgstr "Regular expression"
-#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:239
+#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:243
msgid "Range"
msgstr "Range"
-#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:245
+#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:249
msgid "Additional validation"
msgstr "Additional validation"
-#: inc/field/radiosfield.class.php:107
+#: inc/field/radiosfield.class.php:108
msgid "Radios"
msgstr "Radios"
-#: inc/field/radiosfield.class.php:113 inc/field/glpiselectfield.class.php:97
-#: inc/field/fieldsfield.class.php:512 inc/field/checkboxesfield.class.php:244
-msgid "The field value is required:"
-msgstr "The field value is required:"
+#: inc/field/radiosfield.class.php:116 inc/field/checkboxesfield.class.php:256
+msgid "The field value is required."
+msgstr "The field value is required."
+
+#: inc/field/radiosfield.class.php:127
+msgid "Only one default value is allowed."
+msgstr "Only one default value is allowed."
+
+#: inc/field/radiosfield.class.php:138
+msgid "The default value is not in the list of available values."
+msgstr "The default value is not in the list of available values."
-#: inc/field/radiosfield.class.php:191 inc/field/selectfield.class.php:103
-#: inc/field/datetimefield.class.php:118 inc/field/actorfield.class.php:257
+#: inc/field/radiosfield.class.php:215 inc/field/selectfield.class.php:105
+#: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:257
#: inc/field/checkboxesfield.class.php:190 inc/field/floatfield.class.php:124
-#: inc/field/datefield.class.php:115
#, php-format
msgid "A required field is empty: %s"
msgstr "A required field is empty: %s"
-#: inc/field/integerfield.class.php:59
-#, php-format
-msgid "This is not an integer: %s"
-msgstr "This is not an integer: %s"
-
-#: inc/field/integerfield.class.php:85 inc/field/floatfield.class.php:166
+#: inc/field/radiosfield.class.php:234 inc/field/selectfield.class.php:123
#, php-format
-msgid "The following number must be greater than %d: %s"
-msgstr "The following number must be greater than %d: %s"
+msgid "This value %1$s is not allowed: %2$s"
+msgstr "This value %1$s is not allowed: %2$s"
-#: inc/field/integerfield.class.php:91 inc/field/floatfield.class.php:172
+#: inc/field/integerfield.class.php:60
#, php-format
-msgid "The following number must be lower than %d: %s"
-msgstr "The following number must be lower than %d: %s"
+msgid "This is not an integer: %s"
+msgstr "This is not an integer: %s"
-#: inc/field/integerfield.class.php:101
+#: inc/field/integerfield.class.php:71
msgid "Integer"
msgstr "Integer"
@@ -361,12 +361,16 @@ msgid_plural "Tags"
msgstr[0] "Tag"
msgstr[1] "Tags"
-#: inc/field/glpiselectfield.class.php:82 entrée standard:38
+#: inc/field/glpiselectfield.class.php:84 entrée standard:38
msgid "GLPI object"
msgid_plural "GLPI objects"
msgstr[0] "GLPI object"
msgstr[1] "GLPI objects"
+#: inc/field/glpiselectfield.class.php:101 inc/field/fieldsfield.class.php:512
+msgid "The field value is required:"
+msgstr "The field value is required:"
+
#: inc/field/hostnamefield.class.php:115
msgid "Hostname"
msgid_plural "Hostnames"
@@ -388,11 +392,11 @@ msgid_plural "Emails"
msgstr[0] "Email"
msgstr[1] "Emails"
-#: inc/field/selectfield.class.php:96
+#: inc/field/selectfield.class.php:98
msgid "Select"
msgstr "Select"
-#: inc/field/datetimefield.class.php:139
+#: inc/field/datetimefield.class.php:140
msgid "Date & time"
msgstr "Date & time"
@@ -430,7 +434,7 @@ msgstr "A required file is missing: %s"
msgid "File"
msgstr "File"
-#: inc/field/multiselectfield.class.php:86
+#: inc/field/multiselectfield.class.php:89
msgid "Multiselect"
msgstr "Multiselect"
@@ -471,25 +475,39 @@ msgstr "Additionnal fields"
msgid "Checkboxes"
msgstr "Checkboxes"
-#: inc/field/checkboxesfield.class.php:226
+#: inc/field/checkboxesfield.class.php:208
+#, php-format
+msgid "Empty values are not allowed: %s"
+msgstr "Empty values are not allowed: %s"
+
+#: inc/field/checkboxesfield.class.php:216
+#, php-format
+msgid "This value %1$s is not alowed: %2$s"
+msgstr "This value %1$s is not alowed: %2$s"
+
+#: inc/field/checkboxesfield.class.php:236
#, php-format
msgid "The following question needs at least %d answers: %s"
msgstr "The following question needs at least %d answers: %s"
-#: inc/field/checkboxesfield.class.php:232
+#: inc/field/checkboxesfield.class.php:242
#, php-format
msgid "The following question does not accept more than %d answers: %s"
msgstr "The following question does not accept more than %d answers: %s"
-#: inc/field/checkboxesfield.class.php:304
+#: inc/field/checkboxesfield.class.php:270
+msgid "The default values are not in the list of available values."
+msgstr "The default values are not in the list of available values."
+
+#: inc/field/checkboxesfield.class.php:325
msgid "Range min"
msgstr "Range min"
-#: inc/field/checkboxesfield.class.php:305
+#: inc/field/checkboxesfield.class.php:326
msgid "Range max"
msgstr "Range max"
-#: inc/field/requesttypefield.class.php:86 inc/targetticket.class.php:1089
+#: inc/field/requesttypefield.class.php:86 inc/targetticket.class.php:1107
msgid "Request type"
msgstr "Request type"
@@ -498,11 +516,21 @@ msgstr "Request type"
msgid "This is not a number: %s"
msgstr "This is not a number: %s"
-#: inc/field/floatfield.class.php:182
+#: inc/field/floatfield.class.php:170
+#, php-format
+msgid "The following number must be greater than %d: %s"
+msgstr "The following number must be greater than %d: %s"
+
+#: inc/field/floatfield.class.php:176
+#, php-format
+msgid "The following number must be lower than %d: %s"
+msgstr "The following number must be lower than %d: %s"
+
+#: inc/field/floatfield.class.php:186
msgid "Float"
msgstr "Float"
-#: inc/field/datefield.class.php:136
+#: inc/field/datefield.class.php:66
msgid "Date"
msgstr "Date"
@@ -551,31 +579,31 @@ msgstr "Hidden unless"
msgid "Displayed unless"
msgstr "Displayed unless"
-#: inc/condition.class.php:179 inc/target_actor.class.php:233
-#: inc/form_language.class.php:565 inc/form_validator.class.php:379
+#: inc/condition.class.php:173 inc/target_actor.class.php:233
+#: inc/form_language.class.php:568 inc/form_validator.class.php:379
#: inc/targetproblem.class.php:541 inc/questionrange.class.php:196
#: inc/form.class.php:1920 inc/targetchange.class.php:304
-#: inc/section.class.php:381 inc/restrictedformcriteria.class.php:200
-#: inc/question.class.php:836 inc/questionparameter/range.class.php:202
+#: inc/section.class.php:395 inc/restrictedformcriteria.class.php:200
+#: inc/question.class.php:848 inc/questionparameter/range.class.php:202
#: inc/questionregex.class.php:185 inc/questiondependency.class.php:196
-#: inc/item_targetticket.class.php:154 inc/targetticket.class.php:1399
+#: inc/item_targetticket.class.php:154 inc/targetticket.class.php:1417
#, php-format
msgid "Failed to add or update the %1$s %2$s"
msgstr "Failed to add or update the %1$s %2$s"
-#: inc/condition.class.php:201 inc/target_actor.class.php:254
-#: inc/form_language.class.php:581 inc/form_validator.class.php:403
+#: inc/condition.class.php:195 inc/target_actor.class.php:254
+#: inc/form_language.class.php:584 inc/form_validator.class.php:403
#: inc/targetproblem.class.php:376 inc/questionrange.class.php:131
#: inc/form.class.php:1611 inc/targetchange.class.php:149
-#: inc/section.class.php:406 inc/restrictedformcriteria.class.php:226
-#: inc/question.class.php:885 inc/questionparameter/range.class.php:137
+#: inc/section.class.php:420 inc/restrictedformcriteria.class.php:226
+#: inc/question.class.php:897 inc/questionparameter/range.class.php:137
#: inc/questionregex.class.php:120 inc/questiondependency.class.php:211
-#: inc/item_targetticket.class.php:64 inc/targetticket.class.php:1438
+#: inc/item_targetticket.class.php:64 inc/targetticket.class.php:1456
#, php-format
msgid "Cannot export an empty object: %s"
msgstr "Cannot export an empty object: %s"
-#: inc/condition.class.php:269
+#: inc/condition.class.php:263
msgid "Conditions"
msgstr "Conditions"
@@ -601,13 +629,13 @@ msgstr "Update issue data from tickets and form answers"
msgid "Satisfaction survey expired"
msgstr "Satisfaction survey expired"
-#: inc/issue.class.php:515 inc/form_language.class.php:229
+#: inc/issue.class.php:527 inc/form_language.class.php:232
#: inc/form.class.php:156 inc/form.class.php:2221 entrée standard:52
#: standard:49 standard:57 standard:38 standard:39 standard:46
msgid "Name"
msgstr "Name"
-#: inc/issue.class.php:527 inc/formanswer.class.php:241
+#: inc/issue.class.php:539 inc/formanswer.class.php:241
#: inc/formanswer.class.php:314 inc/targetproblem.class.php:624
#: inc/form.class.php:147 inc/targetchange.class.php:335
#: inc/section.class.php:95 inc/question.class.php:156
@@ -615,32 +643,32 @@ msgstr "Name"
msgid "ID"
msgstr "ID"
-#: inc/issue.class.php:536 inc/form.class.php:503 inc/form.class.php:2230
+#: inc/issue.class.php:548 inc/form.class.php:503 inc/form.class.php:2230
#: entrée standard:111 standard:65
msgid "Type"
msgid_plural "Types"
msgstr[0] "Type"
msgstr[1] "Types"
-#: inc/issue.class.php:549 inc/formanswer.class.php:301
+#: inc/issue.class.php:561 inc/formanswer.class.php:301
msgid "Status"
msgstr "Status"
-#: inc/issue.class.php:561
+#: inc/issue.class.php:573
msgid "Opening date"
msgstr "Opening date"
-#: inc/issue.class.php:570
+#: inc/issue.class.php:582
msgid "Last update"
msgstr "Last update"
-#: inc/issue.class.php:579 inc/abstracttarget.class.php:518
+#: inc/issue.class.php:591 inc/abstracttarget.class.php:520
msgid "Entity"
msgid_plural "Entities"
msgstr[0] "Entity"
msgstr[1] "Entities"
-#: inc/issue.class.php:589 inc/notificationtargetformanswer.class.php:76
+#: inc/issue.class.php:601 inc/notificationtargetformanswer.class.php:76
#: inc/notificationtargetformanswer.class.php:96 inc/target_actor.class.php:101
#: inc/formanswer.class.php:260 inc/formanswer.class.php:712
#: inc/abstractitiltarget.class.php:1753 entrée standard:48
@@ -649,80 +677,80 @@ msgid_plural "Requesters"
msgstr[0] "Requester"
msgstr[1] "Requesters"
-#: inc/issue.class.php:607 inc/formanswer.class.php:270
+#: inc/issue.class.php:619 inc/formanswer.class.php:270
msgid "Form approver"
msgstr "Form approver"
-#: inc/issue.class.php:631 inc/formanswer.class.php:638
+#: inc/issue.class.php:643 inc/formanswer.class.php:638
#: inc/formanswer.class.php:645 inc/formanswer.class.php:727
-#: inc/form_language.class.php:243
+#: inc/form_language.class.php:246
msgid "Comment"
msgstr "Comment"
-#: inc/issue.class.php:643
+#: inc/issue.class.php:655
msgid "Ticket approver"
msgstr "Ticket approver"
-#: inc/issue.class.php:716
+#: inc/issue.class.php:728
msgid "Technician"
msgstr "Technician"
-#: inc/issue.class.php:747
+#: inc/issue.class.php:759
msgid "Technician group"
msgstr "Technician group"
-#: inc/issue.class.php:783 inc/formanswer.class.php:290
+#: inc/issue.class.php:795 inc/formanswer.class.php:290
msgid "Form approver group"
msgstr "Form approver group"
-#: inc/issue.class.php:805
+#: inc/issue.class.php:817
msgid "Ticket approver group"
msgstr "Ticket approver group"
-#: inc/issue.class.php:845
+#: inc/issue.class.php:857
msgid "Ticket requester"
msgstr "Ticket requester"
-#: inc/issue.class.php:892
+#: inc/issue.class.php:904
msgid "Ticket observer"
msgstr "Ticket observer"
-#: inc/issue.class.php:940
+#: inc/issue.class.php:952
msgid "Ticket technician"
msgstr "Ticket technician"
-#: inc/issue.class.php:1083
+#: inc/issue.class.php:1099
#, php-format
msgid "%1$s %2$s"
msgstr "%1$s %2$s"
-#: inc/issue.class.php:1341 inc/filter/itilcategoryfilter.class.php:56
+#: inc/issue.class.php:1357 inc/filter/itilcategoryfilter.class.php:56
#: hook.php:691
msgid "All"
msgstr "All"
-#: inc/issue.class.php:1347 hook.php:692
+#: inc/issue.class.php:1363 hook.php:692
msgid "New"
msgstr "New"
-#: inc/issue.class.php:1353 hook.php:693
+#: inc/issue.class.php:1369 hook.php:693
msgid "Assigned"
msgstr "Assigned"
-#: inc/issue.class.php:1359 inc/formanswer.class.php:78
+#: inc/issue.class.php:1375 inc/formanswer.class.php:78
#: inc/form_validator.class.php:69 hook.php:694
msgid "Waiting"
msgstr "Waiting"
-#: inc/issue.class.php:1365 hook.php:695
+#: inc/issue.class.php:1381 hook.php:695
msgid "To validate"
msgstr "To validate"
-#: inc/issue.class.php:1371 hook.php:696
+#: inc/issue.class.php:1387 hook.php:696
msgid "Solved"
msgstr "Solved"
-#: inc/issue.class.php:1377 hook.php:697
+#: inc/issue.class.php:1393 hook.php:697
msgid "Closed"
msgstr "Closed"
@@ -744,19 +772,19 @@ msgstr "As child of"
msgid "The form as been saved"
msgstr "The form as been saved"
-#: inc/notificationtargetformanswer.class.php:44 install/install.php:418
+#: inc/notificationtargetformanswer.class.php:44 install/install.php:419
msgid "A form need to be validate"
msgstr "A form need to be validate"
-#: inc/notificationtargetformanswer.class.php:45 install/install.php:424
+#: inc/notificationtargetformanswer.class.php:45 install/install.php:425
msgid "The form is refused"
msgstr "The form is refused"
-#: inc/notificationtargetformanswer.class.php:46 install/install.php:430
+#: inc/notificationtargetformanswer.class.php:46 install/install.php:431
msgid "The form is accepted"
msgstr "The form is accepted"
-#: inc/notificationtargetformanswer.class.php:47 install/install.php:436
+#: inc/notificationtargetformanswer.class.php:47 install/install.php:437
msgid "The form is deleted"
msgstr "The form is deleted"
@@ -769,13 +797,6 @@ msgstr "Form ID"
msgid "Form name"
msgstr "Form name"
-#: inc/notificationtargetformanswer.class.php:77
-#: inc/form_validator.class.php:76
-msgid "Validator"
-msgid_plural "Validators"
-msgstr[0] "Validator"
-msgstr[1] "Validators"
-
#: inc/notificationtargetformanswer.class.php:78
#: inc/notificationtargetformanswer.class.php:98 inc/formanswer.class.php:281
#: entrée standard:49
@@ -988,14 +1009,19 @@ msgid "Cannot generate targets!"
msgstr "Cannot generate targets!"
#: inc/formanswer.class.php:1428
+#, php-format
+msgid "Answer is invalid in %1$s"
+msgstr "Answer is invalid in %1$s"
+
+#: inc/formanswer.class.php:1456
msgid "No turing test set"
msgstr "No turing test set"
-#: inc/formanswer.class.php:1434
+#: inc/formanswer.class.php:1462
msgid "You failed the Turing test"
msgstr "You failed the Turing test"
-#: inc/formanswer.class.php:1458
+#: inc/formanswer.class.php:1486
msgid "You must select validator!"
msgstr "You must select validator!"
@@ -1051,62 +1077,62 @@ msgid_plural "Form languages"
msgstr[0] "Form language"
msgstr[1] "Form languages"
-#: inc/form_language.class.php:78 inc/form_language.class.php:364
+#: inc/form_language.class.php:81 inc/form_language.class.php:367
msgid "Translation"
msgid_plural "Translations"
msgstr[0] "Translation"
msgstr[1] "Translations"
-#: inc/form_language.class.php:119
+#: inc/form_language.class.php:122
msgid "The name cannot be empty."
msgstr "The name cannot be empty."
-#: inc/form_language.class.php:127
+#: inc/form_language.class.php:130
msgid "The language must be associated to a form."
msgstr "The language must be associated to a form."
-#: inc/form_language.class.php:135
+#: inc/form_language.class.php:138
msgid "The specified language is not available."
msgstr "The specified language is not available."
-#: inc/form_language.class.php:265
+#: inc/form_language.class.php:268
msgid "Add a translation"
msgstr "Add a translation"
-#: inc/form_language.class.php:299 js/scripts.js:1171
+#: inc/form_language.class.php:302 js/scripts.js:1171
msgid "Update a translation"
msgstr "Update a translation"
-#: inc/form_language.class.php:329 inc/form_language.class.php:331
+#: inc/form_language.class.php:332 inc/form_language.class.php:334
msgid "New translation"
msgstr "New translation"
-#: inc/form_language.class.php:334
+#: inc/form_language.class.php:337
msgid "Filter list"
msgstr "Filter list"
-#: inc/form_language.class.php:339 inc/form_language.class.php:438
+#: inc/form_language.class.php:342 inc/form_language.class.php:441
msgid "No translation found"
msgstr "No translation found"
-#: inc/form_language.class.php:344
+#: inc/form_language.class.php:347
msgid "Do you want to delete the selected items?"
msgstr "Do you want to delete the selected items?"
-#: inc/form_language.class.php:353 inc/form_language.class.php:401
+#: inc/form_language.class.php:356 inc/form_language.class.php:404
#: inc/form.class.php:537 inc/abstractitiltarget.class.php:1658
msgid "Delete"
msgstr "Delete"
-#: inc/form_language.class.php:363
+#: inc/form_language.class.php:366
msgid "Original string"
msgstr "Original string"
-#: inc/form_language.class.php:424
+#: inc/form_language.class.php:427
msgid "Add a new language"
msgstr "Add a new language"
-#: inc/form_language.class.php:457 inc/form_language.class.php:489
+#: inc/form_language.class.php:460 inc/form_language.class.php:492
#: inc/form.class.php:192 entrée standard:72
msgid "Language"
msgstr "Language"
@@ -1116,6 +1142,12 @@ msgstr "Language"
msgid "None"
msgstr "None"
+#: inc/form_validator.class.php:76
+msgid "Validator"
+msgid_plural "Validators"
+msgstr[0] "Validator"
+msgstr[1] "Validators"
+
#: inc/form_validator.class.php:114
msgid "Need validaton?"
msgstr "Need validaton?"
@@ -1153,7 +1185,7 @@ msgid "Properties"
msgstr "Properties"
#: inc/targetproblem.class.php:523 inc/targetchange.class.php:286
-#: inc/targetticket.class.php:1381
+#: inc/targetticket.class.php:1399
#, php-format
msgid ""
"Failed to add or update the %1$s %2$s: a question is missing and is used in "
@@ -1651,11 +1683,11 @@ msgstr[0] "Section"
msgstr[1] "Sections"
#: inc/section.class.php:123 inc/section.class.php:166
-#: inc/question.class.php:320
+#: inc/question.class.php:318
msgid "The title is required"
msgstr "The title is required"
-#: inc/section.class.php:556 inc/question.class.php:203 entrée standard:37
+#: inc/section.class.php:570 inc/question.class.php:203 entrée standard:37
msgid "Count of conditions"
msgstr "Count of conditions"
@@ -1671,73 +1703,73 @@ msgid_plural "Questions"
msgstr[0] "Question"
msgstr[1] "Questions"
-#: inc/question.class.php:328
+#: inc/question.class.php:326
msgid "The field type is required"
msgstr "The field type is required"
-#: inc/question.class.php:335
+#: inc/question.class.php:333
msgid "The section is required"
msgstr "The section is required"
-#: inc/question.class.php:347
+#: inc/question.class.php:345
#, php-format
msgid "Field type %1$s is not available for question %2$s."
msgstr "Field type %1$s is not available for question %2$s."
-#: inc/question.class.php:361
+#: inc/question.class.php:358
msgid "This type of question is not compatible with public forms."
msgstr "This type of question is not compatible with public forms."
-#: inc/question.class.php:370
+#: inc/question.class.php:367
msgid "This type of question requires parameters"
msgstr "This type of question requires parameters"
-#: inc/question.class.php:376
+#: inc/question.class.php:373
msgid "A parameter is missing for this question type"
msgstr "A parameter is missing for this question type"
-#: inc/question.class.php:1190
+#: inc/question.class.php:1202
msgid "Service levels"
msgstr "Service levels"
-#: inc/question.class.php:1191 inc/abstractitiltarget.class.php:834
+#: inc/question.class.php:1203 inc/abstractitiltarget.class.php:834
msgid "SLA"
msgstr "SLA"
-#: inc/question.class.php:1192 inc/abstractitiltarget.class.php:907
+#: inc/question.class.php:1204 inc/abstractitiltarget.class.php:907
msgid "OLA"
msgstr "OLA"
-#: inc/question.class.php:1211 inc/question.class.php:1254
-#: inc/question.class.php:1257
+#: inc/question.class.php:1223 inc/question.class.php:1266
+#: inc/question.class.php:1269
msgid "Assets"
msgstr "Assets"
-#: inc/question.class.php:1225 hook.php:705 hook.php:722
+#: inc/question.class.php:1237 hook.php:705 hook.php:722
msgid "Assistance"
msgstr "Assistance"
-#: inc/question.class.php:1231
+#: inc/question.class.php:1243
msgid "Management"
msgstr "Management"
-#: inc/question.class.php:1242
+#: inc/question.class.php:1254
msgid "Tools"
msgstr "Tools"
-#: inc/question.class.php:1243
+#: inc/question.class.php:1255
msgid "Notes"
msgstr "Notes"
-#: inc/question.class.php:1244
+#: inc/question.class.php:1256
msgid "RSS feed"
msgstr "RSS feed"
-#: inc/question.class.php:1246
+#: inc/question.class.php:1258
msgid "Administration"
msgstr "Administration"
-#: inc/question.class.php:1254 inc/question.class.php:1257
+#: inc/question.class.php:1266 inc/question.class.php:1269
msgid "Plugin"
msgid_plural "Plugins"
msgstr[0] "Plugin"
@@ -1811,15 +1843,15 @@ msgstr "A target must be associated to an existing form."
msgid "Name is required."
msgstr "Name is required."
-#: inc/abstracttarget.class.php:503
+#: inc/abstracttarget.class.php:505
msgid "Destination entity"
msgstr "Destination entity"
-#: inc/abstracttarget.class.php:519
+#: inc/abstracttarget.class.php:521
msgid "User type question"
msgstr "User type question"
-#: inc/abstracttarget.class.php:520
+#: inc/abstracttarget.class.php:522
msgid "Entity type question"
msgstr "Entity type question"
@@ -1982,23 +2014,23 @@ msgstr "Linked item does not exists"
msgid "Failed to link the item"
msgstr "Failed to link the item"
-#: inc/targetticket.class.php:920 install/install.php:431
+#: inc/targetticket.class.php:938 install/install.php:432
msgid "Your form has been accepted by the validator"
msgstr "Your form has been accepted by the validator"
-#: inc/targetticket.class.php:1076
+#: inc/targetticket.class.php:1094
msgid "Request source"
msgstr "Request source"
-#: inc/targetticket.class.php:1101
+#: inc/targetticket.class.php:1119
msgid "Type "
msgstr "Type "
-#: inc/targetticket.class.php:1129
+#: inc/targetticket.class.php:1147
msgid "Associated elements"
msgstr "Associated elements"
-#: inc/targetticket.class.php:1140
+#: inc/targetticket.class.php:1158
msgid "Item "
msgstr "Item "
@@ -2209,12 +2241,12 @@ msgstr "Supplier"
msgid "Yes"
msgstr "Yes"
-#: install/install.php:134
+#: install/install.php:135
#, php-format
msgid "Upgrade tables to innoDB; run %s"
msgstr "Upgrade tables to innoDB; run %s"
-#: install/install.php:171
+#: install/install.php:172
#, php-format
msgid ""
"The database schema is not consistent with the previous version of "
@@ -2223,12 +2255,12 @@ msgstr ""
"The database schema is not consistent with the previous version of "
"Formcreator %s. To see the logs run the command %s"
-#: install/install.php:180
+#: install/install.php:181
#, php-format
msgid "To ignore the inconsistencies and upgrade anyway run %s"
msgstr "To ignore the inconsistencies and upgrade anyway run %s"
-#: install/install.php:197
+#: install/install.php:198
msgid ""
"Upgrade from version older than 2.5.0 is no longer supported. Please upgrade "
"to GLPI 9.5.7, upgrade Formcreator to version 2.12.5, then upgrade again to "
@@ -2238,7 +2270,7 @@ msgstr ""
"to GLPI 9.5.7, upgrade Formcreator to version 2.12.5, then upgrade again to "
"GLPI 10 or later and Formcreator 2.13 or later."
-#: install/install.php:249
+#: install/install.php:250
#, php-format
msgid ""
"The database schema is not consistent with the current version of "
@@ -2247,19 +2279,19 @@ msgstr ""
"The database schema is not consistent with the current version of "
"Formcreator %s. To see the logs enable the plugin and run the command %s"
-#: install/install.php:260
+#: install/install.php:261
msgid "The tables of the plugin passed the schema integrity check."
msgstr "The tables of the plugin passed the schema integrity check."
-#: install/install.php:412
+#: install/install.php:413
msgid "A form has been created"
msgstr "A form has been created"
-#: install/install.php:413
+#: install/install.php:414
msgid "Your request has been saved"
msgstr "Your request has been saved"
-#: install/install.php:414
+#: install/install.php:415
msgid ""
"Hi,\\nYour request from GLPI has been successfully saved with number "
"##formcreator.request_id## and transmitted to the helpdesk team.\\nYou can "
@@ -2269,11 +2301,11 @@ msgstr ""
"##formcreator.request_id## and transmitted to the helpdesk team.\\nYou can "
"see your answers onto the following link:\\n##formcreator.validation_link##"
-#: install/install.php:419
+#: install/install.php:420
msgid "A form from GLPI need to be validate"
msgstr "A form from GLPI need to be validate"
-#: install/install.php:420
+#: install/install.php:421
msgid ""
"Hi,\\nA form from GLPI need to be validate and you have been choosen as the "
"validator.\\nYou can access it by clicking onto this link:\\n##formcreator."
@@ -2283,11 +2315,11 @@ msgstr ""
"validator.\\nYou can access it by clicking onto this link:\\n##formcreator."
"validation_link##"
-#: install/install.php:425
+#: install/install.php:426
msgid "Your form has been refused by the validator"
msgstr "Your form has been refused by the validator"
-#: install/install.php:426
+#: install/install.php:427
msgid ""
"Hi,\\nWe are sorry to inform you that your form has been refused by the "
"validator for the reason below:\\n##formcreator."
@@ -2299,7 +2331,7 @@ msgstr ""
"validation_comment##\\n\\nYou can still modify and resubmit it by clicking "
"onto this link:\\n##formcreator.validation_link##"
-#: install/install.php:432
+#: install/install.php:433
msgid ""
"Hi,\\nWe are pleased to inform you that your form has been accepted by the "
"validator.\\nYour request will be considered soon."
@@ -2307,11 +2339,11 @@ msgstr ""
"Hi,\\nWe are pleased to inform you that your form has been accepted by the "
"validator.\\nYour request will be considered soon."
-#: install/install.php:437
+#: install/install.php:438
msgid "Your form has been deleted by an administrator"
msgstr "Your form has been deleted by an administrator"
-#: install/install.php:438
+#: install/install.php:439
msgid ""
"Hi,\\nWe are sorry to inform you that your request cannot be considered and "
"has been deleted by an administrator."
@@ -2319,25 +2351,25 @@ msgstr ""
"Hi,\\nWe are sorry to inform you that your request cannot be considered and "
"has been deleted by an administrator."
-#: install/install.php:664
+#: install/install.php:665
msgid "Formcreator - Sync service catalog issues"
msgstr "Formcreator - Sync service catalog issues"
-#: install/install.php:852
+#: install/install.php:853
msgid "Failed to check the sanity of the tables!"
msgstr "Failed to check the sanity of the tables!"
-#: install/install.php:866
+#: install/install.php:867
#, php-format
msgid "Table schema differs for table \"%s\"."
msgstr "Table schema differs for table \"%s\"."
-#: install/install.php:869
+#: install/install.php:870
#, php-format
msgid "Table \"%s\" is missing."
msgstr "Table \"%s\" is missing."
-#: install/install.php:872
+#: install/install.php:873
#, php-format
msgid "Unknown table \"%s\" has been found in database."
msgstr "Unknown table \"%s\" has been found in database."
@@ -2430,7 +2462,8 @@ msgstr "Are you sure you want to duplicate this target?"
msgid "Are you sure you want to delete this target?"
msgstr "Are you sure you want to delete this target?"
-#: entrée standard:43 standard:50 standard:44 standard:49 standard:78
+#: entrée standard:43 standard:50 standard:44 standard:82 standard:49
+#: standard:78
msgid "Required"
msgstr "Required"
diff --git a/locales/glpi.pot b/locales/glpi.pot
index 5b5f7e943..b99931e15 100644
--- a/locales/glpi.pot
+++ b/locales/glpi.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-30 09:32+0200\n"
+"POT-Creation-Date: 2023-08-25 11:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -108,7 +108,7 @@ msgstr ""
#: front/wizardreminders.php:49 front/wizardreminders.php:51
#: front/wizard.php:45 front/wizard.php:50 front/wizardfeeds.php:49
#: front/wizardfeeds.php:51 front/issue.php:44 front/issue.php:50
-#: front/formanswer.php:44 front/reservation.php:46 front/reservation.php:48
+#: front/formanswer.php:46 front/reservation.php:46 front/reservation.php:48
#: front/knowbaseitem.form.php:48 front/knowbaseitem.form.php:50
#: front/reservationitem.php:42 front/reservationitem.php:44
#: front/formanswer.form.php:74 front/reservation.form.php:46
@@ -131,7 +131,7 @@ msgid "Bad request while deleting an actor."
msgstr ""
#: front/targetticket.form.php:95 front/targetchange.form.php:81
-#: front/formanswer.php:47 front/targetproblem.form.php:81
+#: front/formanswer.php:49 front/targetproblem.form.php:81
#: front/formanswer.form.php:77 front/form.php:44 inc/common.class.php:692
#: inc/common.class.php:699
msgid "Form Creator"
@@ -177,11 +177,11 @@ msgstr ""
msgid "Please, describe your need here"
msgstr ""
-#: inc/field/textareafield.class.php:185
+#: inc/field/textareafield.class.php:175
msgid "Textarea"
msgstr ""
-#: inc/field/textareafield.class.php:248 inc/field/dropdownfield.class.php:441
+#: inc/field/textareafield.class.php:238 inc/field/dropdownfield.class.php:435
#: inc/field/ldapselectfield.class.php:114 inc/field/textfield.class.php:125
#: inc/field/urgencyfield.class.php:165 inc/field/tagfield.class.php:163
#: inc/field/timefield.class.php:113 inc/field/fieldsfield.class.php:488
@@ -189,41 +189,41 @@ msgstr ""
msgid "A required field is empty:"
msgstr ""
-#: inc/field/textareafield.class.php:266 inc/field/textfield.class.php:178
-#: inc/field/integerfield.class.php:112 inc/field/floatfield.class.php:193
+#: inc/field/textareafield.class.php:256 inc/field/textfield.class.php:178
+#: inc/field/integerfield.class.php:82 inc/field/floatfield.class.php:197
#: inc/conditionnabletrait.class.php:70
msgid "The regular expression is invalid"
msgstr ""
-#: inc/field/dropdownfield.class.php:76 inc/filter/entityfilter.class.php:48
+#: inc/field/dropdownfield.class.php:78 inc/filter/entityfilter.class.php:48
msgid "User and form"
msgstr ""
-#: inc/field/dropdownfield.class.php:432 entrée standard:38
+#: inc/field/dropdownfield.class.php:426 entrée standard:38
msgid "Dropdown"
msgid_plural "Dropdowns"
msgstr[0] ""
msgstr[1] ""
-#: inc/field/dropdownfield.class.php:463
+#: inc/field/dropdownfield.class.php:457
msgid "Invalid value for "
msgstr ""
-#: inc/field/dropdownfield.class.php:475
+#: inc/field/dropdownfield.class.php:469
#, php-format
msgid "The itemtype field is required: %s"
msgstr ""
-#: inc/field/dropdownfield.class.php:491
+#: inc/field/dropdownfield.class.php:485
#, php-format
msgid "Invalid dropdown type: %s"
msgstr ""
-#: inc/field/dropdownfield.class.php:822 entrée standard:162 standard:134
+#: inc/field/dropdownfield.class.php:812 entrée standard:162 standard:134
msgid "Entity restriction"
msgstr ""
-#: inc/field/dropdownfield.class.php:831
+#: inc/field/dropdownfield.class.php:821
msgid ""
"To respect the GLPI entity system, \"Form\" should be selected. Others "
"settings will break the entity restrictions"
@@ -241,8 +241,7 @@ msgstr ""
msgid "LDAP directory not found!"
msgstr ""
-#: inc/field/textfield.class.php:146 inc/field/integerfield.class.php:71
-#: inc/field/floatfield.class.php:155
+#: inc/field/textfield.class.php:146 inc/field/floatfield.class.php:156
#, php-format
msgid "Specific format does not match: %s"
msgstr ""
@@ -261,52 +260,53 @@ msgstr ""
msgid "Text"
msgstr ""
-#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:234
+#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:238
#: inc/questionregex.class.php:62 entrée standard:42
msgid "Regular expression"
msgstr ""
-#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:239
+#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:243
msgid "Range"
msgstr ""
-#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:245
+#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:249
msgid "Additional validation"
msgstr ""
-#: inc/field/radiosfield.class.php:107
+#: inc/field/radiosfield.class.php:108
msgid "Radios"
msgstr ""
-#: inc/field/radiosfield.class.php:113 inc/field/glpiselectfield.class.php:97
-#: inc/field/fieldsfield.class.php:512 inc/field/checkboxesfield.class.php:244
-msgid "The field value is required:"
+#: inc/field/radiosfield.class.php:116 inc/field/checkboxesfield.class.php:256
+msgid "The field value is required."
msgstr ""
-#: inc/field/radiosfield.class.php:191 inc/field/selectfield.class.php:103
-#: inc/field/datetimefield.class.php:118 inc/field/actorfield.class.php:257
-#: inc/field/checkboxesfield.class.php:190 inc/field/floatfield.class.php:124
-#: inc/field/datefield.class.php:115
-#, php-format
-msgid "A required field is empty: %s"
+#: inc/field/radiosfield.class.php:127
+msgid "Only one default value is allowed."
msgstr ""
-#: inc/field/integerfield.class.php:59
+#: inc/field/radiosfield.class.php:138
+msgid "The default value is not in the list of available values."
+msgstr ""
+
+#: inc/field/radiosfield.class.php:215 inc/field/selectfield.class.php:105
+#: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:257
+#: inc/field/checkboxesfield.class.php:190 inc/field/floatfield.class.php:124
#, php-format
-msgid "This is not an integer: %s"
+msgid "A required field is empty: %s"
msgstr ""
-#: inc/field/integerfield.class.php:85 inc/field/floatfield.class.php:166
+#: inc/field/radiosfield.class.php:234 inc/field/selectfield.class.php:123
#, php-format
-msgid "The following number must be greater than %d: %s"
+msgid "This value %1$s is not allowed: %2$s"
msgstr ""
-#: inc/field/integerfield.class.php:91 inc/field/floatfield.class.php:172
+#: inc/field/integerfield.class.php:60
#, php-format
-msgid "The following number must be lower than %d: %s"
+msgid "This is not an integer: %s"
msgstr ""
-#: inc/field/integerfield.class.php:101
+#: inc/field/integerfield.class.php:71
msgid "Integer"
msgstr ""
@@ -359,12 +359,16 @@ msgid_plural "Tags"
msgstr[0] ""
msgstr[1] ""
-#: inc/field/glpiselectfield.class.php:82 entrée standard:38
+#: inc/field/glpiselectfield.class.php:84 entrée standard:38
msgid "GLPI object"
msgid_plural "GLPI objects"
msgstr[0] ""
msgstr[1] ""
+#: inc/field/glpiselectfield.class.php:101 inc/field/fieldsfield.class.php:512
+msgid "The field value is required:"
+msgstr ""
+
#: inc/field/hostnamefield.class.php:115
msgid "Hostname"
msgid_plural "Hostnames"
@@ -386,11 +390,11 @@ msgid_plural "Emails"
msgstr[0] ""
msgstr[1] ""
-#: inc/field/selectfield.class.php:96
+#: inc/field/selectfield.class.php:98
msgid "Select"
msgstr ""
-#: inc/field/datetimefield.class.php:139
+#: inc/field/datetimefield.class.php:140
msgid "Date & time"
msgstr ""
@@ -428,7 +432,7 @@ msgstr ""
msgid "File"
msgstr ""
-#: inc/field/multiselectfield.class.php:86
+#: inc/field/multiselectfield.class.php:89
msgid "Multiselect"
msgstr ""
@@ -469,25 +473,39 @@ msgstr ""
msgid "Checkboxes"
msgstr ""
-#: inc/field/checkboxesfield.class.php:226
+#: inc/field/checkboxesfield.class.php:208
+#, php-format
+msgid "Empty values are not allowed: %s"
+msgstr ""
+
+#: inc/field/checkboxesfield.class.php:216
+#, php-format
+msgid "This value %1$s is not alowed: %2$s"
+msgstr ""
+
+#: inc/field/checkboxesfield.class.php:236
#, php-format
msgid "The following question needs at least %d answers: %s"
msgstr ""
-#: inc/field/checkboxesfield.class.php:232
+#: inc/field/checkboxesfield.class.php:242
#, php-format
msgid "The following question does not accept more than %d answers: %s"
msgstr ""
-#: inc/field/checkboxesfield.class.php:304
+#: inc/field/checkboxesfield.class.php:270
+msgid "The default values are not in the list of available values."
+msgstr ""
+
+#: inc/field/checkboxesfield.class.php:325
msgid "Range min"
msgstr ""
-#: inc/field/checkboxesfield.class.php:305
+#: inc/field/checkboxesfield.class.php:326
msgid "Range max"
msgstr ""
-#: inc/field/requesttypefield.class.php:86 inc/targetticket.class.php:1089
+#: inc/field/requesttypefield.class.php:86 inc/targetticket.class.php:1107
msgid "Request type"
msgstr ""
@@ -496,11 +514,21 @@ msgstr ""
msgid "This is not a number: %s"
msgstr ""
-#: inc/field/floatfield.class.php:182
+#: inc/field/floatfield.class.php:170
+#, php-format
+msgid "The following number must be greater than %d: %s"
+msgstr ""
+
+#: inc/field/floatfield.class.php:176
+#, php-format
+msgid "The following number must be lower than %d: %s"
+msgstr ""
+
+#: inc/field/floatfield.class.php:186
msgid "Float"
msgstr ""
-#: inc/field/datefield.class.php:136
+#: inc/field/datefield.class.php:66
msgid "Date"
msgstr ""
@@ -549,31 +577,31 @@ msgstr ""
msgid "Displayed unless"
msgstr ""
-#: inc/condition.class.php:179 inc/target_actor.class.php:233
-#: inc/form_language.class.php:565 inc/form_validator.class.php:379
+#: inc/condition.class.php:173 inc/target_actor.class.php:233
+#: inc/form_language.class.php:568 inc/form_validator.class.php:379
#: inc/targetproblem.class.php:541 inc/questionrange.class.php:196
#: inc/form.class.php:1920 inc/targetchange.class.php:304
-#: inc/section.class.php:381 inc/restrictedformcriteria.class.php:200
-#: inc/question.class.php:836 inc/questionparameter/range.class.php:202
+#: inc/section.class.php:395 inc/restrictedformcriteria.class.php:200
+#: inc/question.class.php:848 inc/questionparameter/range.class.php:202
#: inc/questionregex.class.php:185 inc/questiondependency.class.php:196
-#: inc/item_targetticket.class.php:154 inc/targetticket.class.php:1399
+#: inc/item_targetticket.class.php:154 inc/targetticket.class.php:1417
#, php-format
msgid "Failed to add or update the %1$s %2$s"
msgstr ""
-#: inc/condition.class.php:201 inc/target_actor.class.php:254
-#: inc/form_language.class.php:581 inc/form_validator.class.php:403
+#: inc/condition.class.php:195 inc/target_actor.class.php:254
+#: inc/form_language.class.php:584 inc/form_validator.class.php:403
#: inc/targetproblem.class.php:376 inc/questionrange.class.php:131
#: inc/form.class.php:1611 inc/targetchange.class.php:149
-#: inc/section.class.php:406 inc/restrictedformcriteria.class.php:226
-#: inc/question.class.php:885 inc/questionparameter/range.class.php:137
+#: inc/section.class.php:420 inc/restrictedformcriteria.class.php:226
+#: inc/question.class.php:897 inc/questionparameter/range.class.php:137
#: inc/questionregex.class.php:120 inc/questiondependency.class.php:211
-#: inc/item_targetticket.class.php:64 inc/targetticket.class.php:1438
+#: inc/item_targetticket.class.php:64 inc/targetticket.class.php:1456
#, php-format
msgid "Cannot export an empty object: %s"
msgstr ""
-#: inc/condition.class.php:269
+#: inc/condition.class.php:263
msgid "Conditions"
msgstr ""
@@ -599,13 +627,13 @@ msgstr ""
msgid "Satisfaction survey expired"
msgstr ""
-#: inc/issue.class.php:515 inc/form_language.class.php:229
+#: inc/issue.class.php:527 inc/form_language.class.php:232
#: inc/form.class.php:156 inc/form.class.php:2221 entrée standard:52
#: standard:49 standard:57 standard:38 standard:39 standard:46
msgid "Name"
msgstr ""
-#: inc/issue.class.php:527 inc/formanswer.class.php:241
+#: inc/issue.class.php:539 inc/formanswer.class.php:241
#: inc/formanswer.class.php:314 inc/targetproblem.class.php:624
#: inc/form.class.php:147 inc/targetchange.class.php:335
#: inc/section.class.php:95 inc/question.class.php:156
@@ -613,32 +641,32 @@ msgstr ""
msgid "ID"
msgstr ""
-#: inc/issue.class.php:536 inc/form.class.php:503 inc/form.class.php:2230
+#: inc/issue.class.php:548 inc/form.class.php:503 inc/form.class.php:2230
#: entrée standard:111 standard:65
msgid "Type"
msgid_plural "Types"
msgstr[0] ""
msgstr[1] ""
-#: inc/issue.class.php:549 inc/formanswer.class.php:301
+#: inc/issue.class.php:561 inc/formanswer.class.php:301
msgid "Status"
msgstr ""
-#: inc/issue.class.php:561
+#: inc/issue.class.php:573
msgid "Opening date"
msgstr ""
-#: inc/issue.class.php:570
+#: inc/issue.class.php:582
msgid "Last update"
msgstr ""
-#: inc/issue.class.php:579 inc/abstracttarget.class.php:518
+#: inc/issue.class.php:591 inc/abstracttarget.class.php:520
msgid "Entity"
msgid_plural "Entities"
msgstr[0] ""
msgstr[1] ""
-#: inc/issue.class.php:589 inc/notificationtargetformanswer.class.php:76
+#: inc/issue.class.php:601 inc/notificationtargetformanswer.class.php:76
#: inc/notificationtargetformanswer.class.php:96 inc/target_actor.class.php:101
#: inc/formanswer.class.php:260 inc/formanswer.class.php:712
#: inc/abstractitiltarget.class.php:1753 entrée standard:48
@@ -647,80 +675,80 @@ msgid_plural "Requesters"
msgstr[0] ""
msgstr[1] ""
-#: inc/issue.class.php:607 inc/formanswer.class.php:270
+#: inc/issue.class.php:619 inc/formanswer.class.php:270
msgid "Form approver"
msgstr ""
-#: inc/issue.class.php:631 inc/formanswer.class.php:638
+#: inc/issue.class.php:643 inc/formanswer.class.php:638
#: inc/formanswer.class.php:645 inc/formanswer.class.php:727
-#: inc/form_language.class.php:243
+#: inc/form_language.class.php:246
msgid "Comment"
msgstr ""
-#: inc/issue.class.php:643
+#: inc/issue.class.php:655
msgid "Ticket approver"
msgstr ""
-#: inc/issue.class.php:716
+#: inc/issue.class.php:728
msgid "Technician"
msgstr ""
-#: inc/issue.class.php:747
+#: inc/issue.class.php:759
msgid "Technician group"
msgstr ""
-#: inc/issue.class.php:783 inc/formanswer.class.php:290
+#: inc/issue.class.php:795 inc/formanswer.class.php:290
msgid "Form approver group"
msgstr ""
-#: inc/issue.class.php:805
+#: inc/issue.class.php:817
msgid "Ticket approver group"
msgstr ""
-#: inc/issue.class.php:845
+#: inc/issue.class.php:857
msgid "Ticket requester"
msgstr ""
-#: inc/issue.class.php:892
+#: inc/issue.class.php:904
msgid "Ticket observer"
msgstr ""
-#: inc/issue.class.php:940
+#: inc/issue.class.php:952
msgid "Ticket technician"
msgstr ""
-#: inc/issue.class.php:1083
+#: inc/issue.class.php:1099
#, php-format
msgid "%1$s %2$s"
msgstr ""
-#: inc/issue.class.php:1341 inc/filter/itilcategoryfilter.class.php:56
+#: inc/issue.class.php:1357 inc/filter/itilcategoryfilter.class.php:56
#: hook.php:691
msgid "All"
msgstr ""
-#: inc/issue.class.php:1347 hook.php:692
+#: inc/issue.class.php:1363 hook.php:692
msgid "New"
msgstr ""
-#: inc/issue.class.php:1353 hook.php:693
+#: inc/issue.class.php:1369 hook.php:693
msgid "Assigned"
msgstr ""
-#: inc/issue.class.php:1359 inc/formanswer.class.php:78
+#: inc/issue.class.php:1375 inc/formanswer.class.php:78
#: inc/form_validator.class.php:69 hook.php:694
msgid "Waiting"
msgstr ""
-#: inc/issue.class.php:1365 hook.php:695
+#: inc/issue.class.php:1381 hook.php:695
msgid "To validate"
msgstr ""
-#: inc/issue.class.php:1371 hook.php:696
+#: inc/issue.class.php:1387 hook.php:696
msgid "Solved"
msgstr ""
-#: inc/issue.class.php:1377 hook.php:697
+#: inc/issue.class.php:1393 hook.php:697
msgid "Closed"
msgstr ""
@@ -742,19 +770,19 @@ msgstr ""
msgid "The form as been saved"
msgstr ""
-#: inc/notificationtargetformanswer.class.php:44 install/install.php:418
+#: inc/notificationtargetformanswer.class.php:44 install/install.php:419
msgid "A form need to be validate"
msgstr ""
-#: inc/notificationtargetformanswer.class.php:45 install/install.php:424
+#: inc/notificationtargetformanswer.class.php:45 install/install.php:425
msgid "The form is refused"
msgstr ""
-#: inc/notificationtargetformanswer.class.php:46 install/install.php:430
+#: inc/notificationtargetformanswer.class.php:46 install/install.php:431
msgid "The form is accepted"
msgstr ""
-#: inc/notificationtargetformanswer.class.php:47 install/install.php:436
+#: inc/notificationtargetformanswer.class.php:47 install/install.php:437
msgid "The form is deleted"
msgstr ""
@@ -767,13 +795,6 @@ msgstr ""
msgid "Form name"
msgstr ""
-#: inc/notificationtargetformanswer.class.php:77
-#: inc/form_validator.class.php:76
-msgid "Validator"
-msgid_plural "Validators"
-msgstr[0] ""
-msgstr[1] ""
-
#: inc/notificationtargetformanswer.class.php:78
#: inc/notificationtargetformanswer.class.php:98 inc/formanswer.class.php:281
#: entrée standard:49
@@ -984,14 +1005,19 @@ msgid "Cannot generate targets!"
msgstr ""
#: inc/formanswer.class.php:1428
+#, php-format
+msgid "Answer is invalid in %1$s"
+msgstr ""
+
+#: inc/formanswer.class.php:1456
msgid "No turing test set"
msgstr ""
-#: inc/formanswer.class.php:1434
+#: inc/formanswer.class.php:1462
msgid "You failed the Turing test"
msgstr ""
-#: inc/formanswer.class.php:1458
+#: inc/formanswer.class.php:1486
msgid "You must select validator!"
msgstr ""
@@ -1047,62 +1073,62 @@ msgid_plural "Form languages"
msgstr[0] ""
msgstr[1] ""
-#: inc/form_language.class.php:78 inc/form_language.class.php:364
+#: inc/form_language.class.php:81 inc/form_language.class.php:367
msgid "Translation"
msgid_plural "Translations"
msgstr[0] ""
msgstr[1] ""
-#: inc/form_language.class.php:119
+#: inc/form_language.class.php:122
msgid "The name cannot be empty."
msgstr ""
-#: inc/form_language.class.php:127
+#: inc/form_language.class.php:130
msgid "The language must be associated to a form."
msgstr ""
-#: inc/form_language.class.php:135
+#: inc/form_language.class.php:138
msgid "The specified language is not available."
msgstr ""
-#: inc/form_language.class.php:265
+#: inc/form_language.class.php:268
msgid "Add a translation"
msgstr ""
-#: inc/form_language.class.php:299 js/scripts.js:1171
+#: inc/form_language.class.php:302 js/scripts.js:1171
msgid "Update a translation"
msgstr ""
-#: inc/form_language.class.php:329 inc/form_language.class.php:331
+#: inc/form_language.class.php:332 inc/form_language.class.php:334
msgid "New translation"
msgstr ""
-#: inc/form_language.class.php:334
+#: inc/form_language.class.php:337
msgid "Filter list"
msgstr ""
-#: inc/form_language.class.php:339 inc/form_language.class.php:438
+#: inc/form_language.class.php:342 inc/form_language.class.php:441
msgid "No translation found"
msgstr ""
-#: inc/form_language.class.php:344
+#: inc/form_language.class.php:347
msgid "Do you want to delete the selected items?"
msgstr ""
-#: inc/form_language.class.php:353 inc/form_language.class.php:401
+#: inc/form_language.class.php:356 inc/form_language.class.php:404
#: inc/form.class.php:537 inc/abstractitiltarget.class.php:1658
msgid "Delete"
msgstr ""
-#: inc/form_language.class.php:363
+#: inc/form_language.class.php:366
msgid "Original string"
msgstr ""
-#: inc/form_language.class.php:424
+#: inc/form_language.class.php:427
msgid "Add a new language"
msgstr ""
-#: inc/form_language.class.php:457 inc/form_language.class.php:489
+#: inc/form_language.class.php:460 inc/form_language.class.php:492
#: inc/form.class.php:192 entrée standard:72
msgid "Language"
msgstr ""
@@ -1112,6 +1138,12 @@ msgstr ""
msgid "None"
msgstr ""
+#: inc/form_validator.class.php:76
+msgid "Validator"
+msgid_plural "Validators"
+msgstr[0] ""
+msgstr[1] ""
+
#: inc/form_validator.class.php:114
msgid "Need validaton?"
msgstr ""
@@ -1149,7 +1181,7 @@ msgid "Properties"
msgstr ""
#: inc/targetproblem.class.php:523 inc/targetchange.class.php:286
-#: inc/targetticket.class.php:1381
+#: inc/targetticket.class.php:1399
#, php-format
msgid ""
"Failed to add or update the %1$s %2$s: a question is missing and is used in "
@@ -1643,11 +1675,11 @@ msgstr[0] ""
msgstr[1] ""
#: inc/section.class.php:123 inc/section.class.php:166
-#: inc/question.class.php:320
+#: inc/question.class.php:318
msgid "The title is required"
msgstr ""
-#: inc/section.class.php:556 inc/question.class.php:203 entrée standard:37
+#: inc/section.class.php:570 inc/question.class.php:203 entrée standard:37
msgid "Count of conditions"
msgstr ""
@@ -1663,73 +1695,73 @@ msgid_plural "Questions"
msgstr[0] ""
msgstr[1] ""
-#: inc/question.class.php:328
+#: inc/question.class.php:326
msgid "The field type is required"
msgstr ""
-#: inc/question.class.php:335
+#: inc/question.class.php:333
msgid "The section is required"
msgstr ""
-#: inc/question.class.php:347
+#: inc/question.class.php:345
#, php-format
msgid "Field type %1$s is not available for question %2$s."
msgstr ""
-#: inc/question.class.php:361
+#: inc/question.class.php:358
msgid "This type of question is not compatible with public forms."
msgstr ""
-#: inc/question.class.php:370
+#: inc/question.class.php:367
msgid "This type of question requires parameters"
msgstr ""
-#: inc/question.class.php:376
+#: inc/question.class.php:373
msgid "A parameter is missing for this question type"
msgstr ""
-#: inc/question.class.php:1190
+#: inc/question.class.php:1202
msgid "Service levels"
msgstr ""
-#: inc/question.class.php:1191 inc/abstractitiltarget.class.php:834
+#: inc/question.class.php:1203 inc/abstractitiltarget.class.php:834
msgid "SLA"
msgstr ""
-#: inc/question.class.php:1192 inc/abstractitiltarget.class.php:907
+#: inc/question.class.php:1204 inc/abstractitiltarget.class.php:907
msgid "OLA"
msgstr ""
-#: inc/question.class.php:1211 inc/question.class.php:1254
-#: inc/question.class.php:1257
+#: inc/question.class.php:1223 inc/question.class.php:1266
+#: inc/question.class.php:1269
msgid "Assets"
msgstr ""
-#: inc/question.class.php:1225 hook.php:705 hook.php:722
+#: inc/question.class.php:1237 hook.php:705 hook.php:722
msgid "Assistance"
msgstr ""
-#: inc/question.class.php:1231
+#: inc/question.class.php:1243
msgid "Management"
msgstr ""
-#: inc/question.class.php:1242
+#: inc/question.class.php:1254
msgid "Tools"
msgstr ""
-#: inc/question.class.php:1243
+#: inc/question.class.php:1255
msgid "Notes"
msgstr ""
-#: inc/question.class.php:1244
+#: inc/question.class.php:1256
msgid "RSS feed"
msgstr ""
-#: inc/question.class.php:1246
+#: inc/question.class.php:1258
msgid "Administration"
msgstr ""
-#: inc/question.class.php:1254 inc/question.class.php:1257
+#: inc/question.class.php:1266 inc/question.class.php:1269
msgid "Plugin"
msgid_plural "Plugins"
msgstr[0] ""
@@ -1803,15 +1835,15 @@ msgstr ""
msgid "Name is required."
msgstr ""
-#: inc/abstracttarget.class.php:503
+#: inc/abstracttarget.class.php:505
msgid "Destination entity"
msgstr ""
-#: inc/abstracttarget.class.php:519
+#: inc/abstracttarget.class.php:521
msgid "User type question"
msgstr ""
-#: inc/abstracttarget.class.php:520
+#: inc/abstracttarget.class.php:522
msgid "Entity type question"
msgstr ""
@@ -1974,23 +2006,23 @@ msgstr ""
msgid "Failed to link the item"
msgstr ""
-#: inc/targetticket.class.php:920 install/install.php:431
+#: inc/targetticket.class.php:938 install/install.php:432
msgid "Your form has been accepted by the validator"
msgstr ""
-#: inc/targetticket.class.php:1076
+#: inc/targetticket.class.php:1094
msgid "Request source"
msgstr ""
-#: inc/targetticket.class.php:1101
+#: inc/targetticket.class.php:1119
msgid "Type "
msgstr ""
-#: inc/targetticket.class.php:1129
+#: inc/targetticket.class.php:1147
msgid "Associated elements"
msgstr ""
-#: inc/targetticket.class.php:1140
+#: inc/targetticket.class.php:1158
msgid "Item "
msgstr ""
@@ -2201,72 +2233,72 @@ msgstr ""
msgid "Yes"
msgstr ""
-#: install/install.php:134
+#: install/install.php:135
#, php-format
msgid "Upgrade tables to innoDB; run %s"
msgstr ""
-#: install/install.php:171
+#: install/install.php:172
#, php-format
msgid ""
"The database schema is not consistent with the previous version of "
"Formcreator %s. To see the logs run the command %s"
msgstr ""
-#: install/install.php:180
+#: install/install.php:181
#, php-format
msgid "To ignore the inconsistencies and upgrade anyway run %s"
msgstr ""
-#: install/install.php:197
+#: install/install.php:198
msgid ""
"Upgrade from version older than 2.5.0 is no longer supported. Please upgrade "
"to GLPI 9.5.7, upgrade Formcreator to version 2.12.5, then upgrade again to "
"GLPI 10 or later and Formcreator 2.13 or later."
msgstr ""
-#: install/install.php:249
+#: install/install.php:250
#, php-format
msgid ""
"The database schema is not consistent with the current version of "
"Formcreator %s. To see the logs enable the plugin and run the command %s"
msgstr ""
-#: install/install.php:260
+#: install/install.php:261
msgid "The tables of the plugin passed the schema integrity check."
msgstr ""
-#: install/install.php:412
+#: install/install.php:413
msgid "A form has been created"
msgstr ""
-#: install/install.php:413
+#: install/install.php:414
msgid "Your request has been saved"
msgstr ""
-#: install/install.php:414
+#: install/install.php:415
msgid ""
"Hi,\\nYour request from GLPI has been successfully saved with number "
"##formcreator.request_id## and transmitted to the helpdesk team.\\nYou can "
"see your answers onto the following link:\\n##formcreator.validation_link##"
msgstr ""
-#: install/install.php:419
+#: install/install.php:420
msgid "A form from GLPI need to be validate"
msgstr ""
-#: install/install.php:420
+#: install/install.php:421
msgid ""
"Hi,\\nA form from GLPI need to be validate and you have been choosen as the "
"validator.\\nYou can access it by clicking onto this link:\\n##formcreator."
"validation_link##"
msgstr ""
-#: install/install.php:425
+#: install/install.php:426
msgid "Your form has been refused by the validator"
msgstr ""
-#: install/install.php:426
+#: install/install.php:427
msgid ""
"Hi,\\nWe are sorry to inform you that your form has been refused by the "
"validator for the reason below:\\n##formcreator."
@@ -2274,41 +2306,41 @@ msgid ""
"onto this link:\\n##formcreator.validation_link##"
msgstr ""
-#: install/install.php:432
+#: install/install.php:433
msgid ""
"Hi,\\nWe are pleased to inform you that your form has been accepted by the "
"validator.\\nYour request will be considered soon."
msgstr ""
-#: install/install.php:437
+#: install/install.php:438
msgid "Your form has been deleted by an administrator"
msgstr ""
-#: install/install.php:438
+#: install/install.php:439
msgid ""
"Hi,\\nWe are sorry to inform you that your request cannot be considered and "
"has been deleted by an administrator."
msgstr ""
-#: install/install.php:664
+#: install/install.php:665
msgid "Formcreator - Sync service catalog issues"
msgstr ""
-#: install/install.php:852
+#: install/install.php:853
msgid "Failed to check the sanity of the tables!"
msgstr ""
-#: install/install.php:866
+#: install/install.php:867
#, php-format
msgid "Table schema differs for table \"%s\"."
msgstr ""
-#: install/install.php:869
+#: install/install.php:870
#, php-format
msgid "Table \"%s\" is missing."
msgstr ""
-#: install/install.php:872
+#: install/install.php:873
#, php-format
msgid "Unknown table \"%s\" has been found in database."
msgstr ""
@@ -2399,7 +2431,8 @@ msgstr ""
msgid "Are you sure you want to delete this target?"
msgstr ""
-#: entrée standard:43 standard:50 standard:44 standard:49 standard:78
+#: entrée standard:43 standard:50 standard:44 standard:82 standard:49
+#: standard:78
msgid "Required"
msgstr ""
diff --git a/templates/field/dropdownfield.html.twig b/templates/field/dropdownfield.html.twig
index dc6c9eba7..6b4238c6f 100644
--- a/templates/field/dropdownfield.html.twig
+++ b/templates/field/dropdownfield.html.twig
@@ -108,7 +108,7 @@
0: __('Time to resolve', 'formcreator'),
1: __('Time to own', 'formcreator'),
},
- __('Type', 'formcreator')
+ _n('Type', 'Types', 'formcreator')
) }}
{{ fields.nullField({
diff --git a/templates/pages/form.formanswer.html.twig b/templates/pages/form.formanswer.html.twig
index 616179b60..d971d1ba5 100644
--- a/templates/pages/form.formanswer.html.twig
+++ b/templates/pages/form.formanswer.html.twig
@@ -44,8 +44,8 @@
{{ __('ID') }} |
{{ __('Name') }} |
- {{ __('Form') }} |
- {{ __('Requester', 'Requesters', 1) }} |
+ {{ _n('Form', 'Forms', 1, 'formcreator') }} |
+ {{ _n('Requester', 'Requesters', 1) }} |
{{ __('Creation date') }} |