From b8d64662d011b41f4e036d2f1e2d57d88935efef Mon Sep 17 00:00:00 2001
From: Thierry Bugier <tbugier@teclib.com>
Date: Mon, 14 Sep 2020 08:12:53 +0200
Subject: [PATCH] fix(locales): reapply bad translation fix

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
---
 locales/fr_FR.mo | Bin 25530 -> 25529 bytes
 locales/fr_FR.po |   2 +-
 locales/glpi.pot | 125 +++++++++++++++++++++++++----------------------
 3 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo
index 7c1c2601e8708b494e21504e4504093a3c03776d..8b7b276e732d7b1ed6ab6c8473be9c9776c5a6ce 100644
GIT binary patch
delta 408
zcmXZYy-Pw-7{~EPv8xs$Dk7K!fv=$Xf{8-3HPlj*xcG7l6hw4tzRiJyv^E3@js}8I
zGzdWwh@*@DhMP;@b9MSWzu(~;9?sX?@;SGBe0z+%h?J@#=h($#9AXe>7{xUP&{`9@
z!XPHGfnMyRAK%c8Q#`<5yu}3`VyG@+!x)AzSr@|`t|?j+O;isr_ioWnjyFUin86b)
zqk8ZW)dElGz!y~gE1uy93%J5Kx^$6KEMOKZx*<|zc&5nU&;DS88aaBuGlgoAJgSQq
tX#N<6$wR!vKTM$GVYfgI(_|ezIKU%(M<<RaC7<`k*6DRyle=nL`v(BgIL`n8

delta 407
zcmXZYF-t;G7{>8eOuZ^3DiNd!ft7;Yx`>v8Z7nW>i#Xi$>Tt(4*Q>M8P_7Mvf}`Ld
zg^M6u2%@p2uhHhv|ESaNeV)TPyqtH}^Wl1C%cxTjk&-E*e8L1y@B~+Qfxmc+-baxK
zOkfTzjNvmL;RqwRKp(nT#V-uuX;b6?GnmAyra0T7LSa+bs2={_yTJfC+Y&iP15;Q>
z^<Wp(0)5nQh^l`>9j92tAI#vPC31$hXkf!~MD7>{6gRluAN--8eA(WqqgteZ>S7tU
qKZa@Y1n=<^vl#5`7Rci@xs6eL!7z?7h_iVq9;>|eOl@8>ZT~;;$T-3P

diff --git a/locales/fr_FR.po b/locales/fr_FR.po
index 399a144d8..453396aa8 100644
--- a/locales/fr_FR.po
+++ b/locales/fr_FR.po
@@ -1311,7 +1311,7 @@ msgstr "Le texte est trop court (minimum %d caractères) : %s"
 #: inc/fields/textfield.class.php:167
 #, php-format
 msgid "The text is too long (maximum %d characters): %s"
-msgstr "Le texte est trop court (maximum %d caractères) : %s"
+msgstr "Le texte est trop long (maximum %d caractères) : %s"
 
 #: inc/fields/textfield.class.php:175
 msgid "Text"
diff --git a/locales/glpi.pot b/locales/glpi.pot
index be33faadc..58791543e 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: 2020-10-12 15:25+0200\n"
+"POT-Creation-Date: 2020-10-22 09:50+0200\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"
@@ -24,17 +24,17 @@ msgid_plural "Form categories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hook.php:509
+#: hook.php:513
 msgid "Cancel my ticket"
 msgstr ""
 
-#: setup.php:236 inc/form.class.php:108 inc/formlist.class.php:59
+#: setup.php:235 inc/form.class.php:108 inc/formlist.class.php:59
 #: inc/formlist.class.php:60
 msgid "Forms waiting for validation"
 msgstr ""
 
-#: setup.php:246 ajax/homepage_link.php:37 inc/entityconfig.class.php:55
-#: inc/form.class.php:101 inc/form.class.php:712 inc/form.class.php:2035
+#: setup.php:245 ajax/homepage_link.php:37 inc/entityconfig.class.php:55
+#: inc/form.class.php:101 inc/form.class.php:712 inc/form.class.php:2036
 #: inc/formanswer.class.php:184 inc/formlist.class.php:46 js/scripts.js.php:72
 msgid "Form"
 msgid_plural "Forms"
@@ -56,8 +56,8 @@ msgstr ""
 #: front/form.php:45 front/formanswer.form.php:83 front/formanswer.form.php:88
 #: front/formanswer.php:46 front/formanswer.php:51 front/issue.php:48
 #: front/issue.php:53 front/targetchange.form.php:74
-#: front/targetticket.form.php:74 inc/form.class.php:2103
-#: inc/form.class.php:2110
+#: front/targetticket.form.php:74 inc/form.class.php:2104
+#: inc/form.class.php:2111
 msgid "Form Creator"
 msgstr ""
 
@@ -65,11 +65,11 @@ msgstr ""
 #: front/issue.php:44 front/knowbaseitem.form.php:45
 #: front/reservation.form.php:46 front/reservation.php:46
 #: front/reservationitem.php:42 front/wizard.php:45 front/wizardfeeds.php:46
-#: inc/form.class.php:2098
+#: inc/form.class.php:2099
 msgid "Service catalog"
 msgstr ""
 
-#: front/formlist.php:46 front/formlist.php:52 inc/form.class.php:2100
+#: front/formlist.php:46 front/formlist.php:52 inc/form.class.php:2101
 msgid "Form list"
 msgstr ""
 
@@ -117,13 +117,13 @@ msgstr ""
 msgid "Displayed unless"
 msgstr ""
 
-#: inc/condition.class.php:159 inc/form.class.php:1933
+#: inc/condition.class.php:159 inc/form.class.php:1934
 #: inc/form_profile.class.php:215 inc/form_validator.class.php:109
 #: inc/item_targetticket.class.php:141 inc/question.class.php:970
 #: inc/questiondependency.class.php:200 inc/questionrange.class.php:178
 #: inc/questionregex.class.php:173 inc/section.class.php:269
-#: inc/target_actor.class.php:173 inc/targetchange.class.php:233
-#: inc/targetticket.class.php:1124
+#: inc/target_actor.class.php:173 inc/targetchange.class.php:237
+#: inc/targetticket.class.php:1128
 #, php-format
 msgid "failed to add or update the %1$s %2$s"
 msgstr ""
@@ -224,7 +224,7 @@ msgstr[1] ""
 msgid "Delete"
 msgstr ""
 
-#: inc/form.class.php:668 inc/form.class.php:2257
+#: inc/form.class.php:668 inc/form.class.php:2258
 msgid "Add a target"
 msgstr ""
 
@@ -289,140 +289,140 @@ msgstr ""
 msgid "Choose a validator"
 msgstr ""
 
-#: inc/form.class.php:1297 inc/targetbase.class.php:1311
+#: inc/form.class.php:1298 inc/targetbase.class.php:1311
 msgid "The name cannot be empty!"
 msgstr ""
 
-#: inc/form.class.php:1360
+#: inc/form.class.php:1361
 #, php-format
 msgid "The question %s is not compatible with public forms"
 msgstr ""
 
-#: inc/form.class.php:1498
+#: inc/form.class.php:1499
 msgid "Errored duplicate"
 msgstr ""
 
-#: inc/form.class.php:1509
+#: inc/form.class.php:1510
 msgid "Duplicate"
 msgstr ""
 
-#: inc/form.class.php:1574
+#: inc/form.class.php:1575
 #, php-format
 msgid "Form duplicated: %s"
 msgstr ""
 
-#: inc/form.class.php:1585
+#: inc/form.class.php:1586
 #, php-format
 msgid "Form Transfered: %s"
 msgstr ""
 
-#: inc/form.class.php:1708
+#: inc/form.class.php:1709
 msgid "Upload of JSON files not allowed."
 msgstr ""
 
-#: inc/form.class.php:1711
+#: inc/form.class.php:1712
 msgid "You may allow JSON files right now."
 msgstr ""
 
-#: inc/form.class.php:1712
+#: inc/form.class.php:1713
 msgctxt "button"
 msgid "Create"
 msgstr ""
 
-#: inc/form.class.php:1715 inc/form.class.php:1726
+#: inc/form.class.php:1716 inc/form.class.php:1727
 msgid "Please contact your GLPI administrator."
 msgstr ""
 
-#: inc/form.class.php:1716 inc/form.class.php:1727
+#: inc/form.class.php:1717 inc/form.class.php:1728
 msgctxt "button"
 msgid "Back"
 msgstr ""
 
-#: inc/form.class.php:1719
+#: inc/form.class.php:1720
 msgid "Upload of JSON files not enabled."
 msgstr ""
 
-#: inc/form.class.php:1722 inc/form.class.php:1725
+#: inc/form.class.php:1723 inc/form.class.php:1726
 msgid "You may enable JSON files right now."
 msgstr ""
 
-#: inc/form.class.php:1723
+#: inc/form.class.php:1724
 msgctxt "button"
 msgid "Enable"
 msgstr ""
 
-#: inc/form.class.php:1788
+#: inc/form.class.php:1789
 msgid "No file uploaded"
 msgstr ""
 
-#: inc/form.class.php:1797
+#: inc/form.class.php:1798
 msgid "Forms import impossible, the file is empty"
 msgstr ""
 
-#: inc/form.class.php:1801 inc/form.class.php:1805
+#: inc/form.class.php:1802 inc/form.class.php:1806
 msgid "Forms import impossible, the file seems corrupt"
 msgstr ""
 
-#: inc/form.class.php:1811
+#: inc/form.class.php:1812
 msgid "Forms import impossible, the file was generated with another version"
 msgstr ""
 
-#: inc/form.class.php:1818
+#: inc/form.class.php:1819
 msgid ""
 "The file does not specifies the schema version. It was probably generated "
 "with a version older than 2.10 and import is expected to create incomplete "
 "or buggy forms."
 msgstr ""
 
-#: inc/form.class.php:1836
+#: inc/form.class.php:1837
 #, php-format
 msgid "Failed to import %s"
 msgstr ""
 
-#: inc/form.class.php:1841
+#: inc/form.class.php:1842
 #, php-format
 msgid "Forms successfully imported from %s"
 msgstr ""
 
-#: inc/form.class.php:1888
+#: inc/form.class.php:1889
 #, php-format
 msgid "The form %1$s already exists and is in an unmodifiable entity."
 msgstr ""
 
-#: inc/form.class.php:1896
+#: inc/form.class.php:1897
 #, php-format
 msgid "The entity %1$s is required for the form %2$s."
 msgstr ""
 
-#: inc/form.class.php:1970
+#: inc/form.class.php:1971
 msgid "Failed to create JSON document type"
 msgstr ""
 
-#: inc/form.class.php:1977
+#: inc/form.class.php:1978
 msgid "JSON document type not found"
 msgstr ""
 
-#: inc/form.class.php:1984
+#: inc/form.class.php:1985
 msgid "Failed to update JSON document type"
 msgstr ""
 
-#: inc/form.class.php:2004
+#: inc/form.class.php:2005
 msgid "Forms without category"
 msgstr ""
 
-#: inc/form.class.php:2027
+#: inc/form.class.php:2028
 msgid "No form available"
 msgstr ""
 
-#: inc/form.class.php:2299
+#: inc/form.class.php:2300
 msgid "Unsupported target type."
 msgstr ""
 
-#: inc/form.class.php:2311
+#: inc/form.class.php:2312
 msgid "The form does not exists."
 msgstr ""
 
-#: inc/form.class.php:2334
+#: inc/form.class.php:2335
 msgid "Unsuported target type."
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr ""
 msgid "Waiting"
 msgstr ""
 
-#: inc/formanswer.class.php:61 inc/issue.class.php:515
+#: inc/formanswer.class.php:61 inc/issue.class.php:533
 msgid "Refused"
 msgstr ""
 
@@ -452,17 +452,17 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
-#: inc/formanswer.class.php:160 inc/issue.class.php:509
+#: inc/formanswer.class.php:160 inc/issue.class.php:527
 msgid "Form answer"
 msgid_plural "Form answers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: inc/formanswer.class.php:204 inc/issue.class.php:404
+#: inc/formanswer.class.php:204 inc/issue.class.php:422
 msgid "Form approver"
 msgstr ""
 
-#: inc/formanswer.class.php:223 inc/issue.class.php:492
+#: inc/formanswer.class.php:223 inc/issue.class.php:510
 msgid "Form approver group"
 msgstr ""
 
@@ -523,7 +523,7 @@ msgstr ""
 msgid "You must select validator!"
 msgstr ""
 
-#: inc/issue.class.php:40 inc/issue.class.php:312
+#: inc/issue.class.php:40 inc/issue.class.php:330
 msgid "Issue"
 msgid_plural "Issues"
 msgstr[0] ""
@@ -533,11 +533,11 @@ msgstr[1] ""
 msgid "Update issue data from tickets and form answers"
 msgstr ""
 
-#: inc/issue.class.php:423
+#: inc/issue.class.php:441
 msgid "Ticket approver"
 msgstr ""
 
-#: inc/issue.class.php:514
+#: inc/issue.class.php:532
 msgid "Not validated"
 msgstr ""
 
@@ -925,7 +925,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: inc/targetbase.class.php:1586 inc/targetchange.class.php:389
+#: inc/targetbase.class.php:1586 inc/targetchange.class.php:393
 #: inc/targetticket.class.php:223
 msgid "Cancel"
 msgstr ""
@@ -938,7 +938,7 @@ msgstr ""
 msgid "Tech group from the object"
 msgstr ""
 
-#: inc/targetchange.class.php:41 inc/targetchange.class.php:275
+#: inc/targetchange.class.php:41 inc/targetchange.class.php:279
 msgid "Target change"
 msgid_plural "Target changes"
 msgstr[0] ""
@@ -952,15 +952,22 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: inc/targetchange.class.php:265 inc/targetticket.class.php:119
+#: inc/targetchange.class.php:221 inc/targetticket.class.php:1112
+#, php-format
+msgid ""
+"failed to add or update the %1$s %2$s: a question is missing and is used in "
+"a parameter of the target"
+msgstr ""
+
+#: inc/targetchange.class.php:269 inc/targetticket.class.php:119
 msgid "Edit a destination"
 msgstr ""
 
-#: inc/targetchange.class.php:278
+#: inc/targetchange.class.php:282
 msgid "Change title"
 msgstr ""
 
-#: inc/targetchange.class.php:376 inc/targetticket.class.php:210
+#: inc/targetchange.class.php:380 inc/targetticket.class.php:210
 msgid "Condition to show the target"
 msgstr ""
 
@@ -1070,7 +1077,7 @@ msgstr[1] ""
 
 #: inc/fields/actorfield.class.php:242 inc/fields/checkboxesfield.class.php:187
 #: inc/fields/datefield.class.php:87 inc/fields/datetimefield.class.php:90
-#: inc/fields/dropdownfield.class.php:348 inc/fields/emailfield.class.php:94
+#: inc/fields/dropdownfield.class.php:347 inc/fields/emailfield.class.php:94
 #: inc/fields/floatfield.class.php:127 inc/fields/glpiselectfield.class.php:135
 #: inc/fields/integerfield.class.php:128
 #: inc/fields/ldapselectfield.class.php:184
@@ -1104,7 +1111,7 @@ msgid "Checkboxes"
 msgstr ""
 
 #: inc/fields/checkboxesfield.class.php:227
-#: inc/fields/dropdownfield.class.php:362
+#: inc/fields/dropdownfield.class.php:361
 #: inc/fields/glpiselectfield.class.php:118
 #: inc/fields/multiselectfield.class.php:187
 #: inc/fields/radiosfield.class.php:141
@@ -1141,7 +1148,7 @@ msgstr ""
 msgid "Change categories"
 msgstr ""
 
-#: inc/fields/dropdownfield.class.php:374
+#: inc/fields/dropdownfield.class.php:373
 msgid "Invalid dropdown type:"
 msgstr ""