Skip to content
This repository was archived by the owner on Oct 9, 2023. It is now read-only.

Commit b22335d

Browse files
cedric-annecedric-anne
committed
Merge branch 'release/4.3.1'
2 parents d413e7b + 4753644 commit b22335d

File tree

17 files changed

+806
-148
lines changed

17 files changed

+806
-148
lines changed

‎composer.lock

Lines changed: 262 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎inc/mantis.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ static function getDocumentFromItem($idItem, $itemType) {
388388

389389
if ($conf->fields['doc_categorie'] != 0) {
390390
$query.= " AND `glpi_documents`.`documentcategories_id` = '"
391-
. Toolbox::cleanInteger($conf->fields['doc_categorie']);
391+
. Toolbox::cleanInteger($conf->fields['doc_categorie']) . "' ";
392392
}
393393

394394
$res = $DB->query($query);

‎locales/cs_CZ.mo

-2 Bytes
Binary file not shown.

‎locales/cs_CZ.po

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,20 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
55
#
6+
# Translators:
7+
# Pavel Borecki <pavel.borecki@gmail.com>, 2018
8+
#
69
#, fuzzy
710
msgid ""
811
msgstr ""
912
"Project-Id-Version: PACKAGE VERSION\n"
1013
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-08-21 14:59+0000\n"
12-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14+
"POT-Creation-Date: 2019-07-08 13:00+0000\n"
15+
"PO-Revision-Date: 2016-10-05 17:06+0000\n"
1316
"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
1417
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n"
1518
"MIME-Version: 1.0\n"
16-
"Content-Type: text/plain; charset=CHARSET\n"
19+
"Content-Type: text/plain; charset=UTF-8\n"
1720
"Content-Transfer-Encoding: 8bit\n"
1821
"Language: cs_CZ\n"
1922
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
@@ -448,7 +451,7 @@ msgstr "Kategorie = %1$s <br/>"
448451
msgid "Link to GLPi object = %1$s <br/>"
449452
msgstr "Propojení s GLPi objektem = %1$s <br/>"
450453

451-
#: inc/issue.class.php:875
454+
#: inc/issue.class.php:876
452455
#, php-format
453456
msgid ""
454457
"Followups = %1$s -> date : %2$s, request type : %3$s, user : %4$s, content :"
@@ -457,15 +460,15 @@ msgstr ""
457460
"Následná komunikace = %1$s -> datum: %2$s, typ požadavku: %3$s, uživatel: "
458461
"%4$s, obsah: %5$s<br/>"
459462

460-
#: inc/issue.class.php:883
463+
#: inc/issue.class.php:884
461464
msgid "No follow-up"
462465
msgstr "Žádná doplňující komunikace"
463466

464-
#: inc/issue.class.php:918
467+
#: inc/issue.class.php:919
465468
#, php-format
466469
msgid "Task = %1$s -> date : %2$s, description : %3$s, time : %4$s<br/>"
467470
msgstr "Úkol = %1$s -> datum: %2$s, popis: %3$s, čas: %4$s<br/>"
468471

469-
#: inc/issue.class.php:925
472+
#: inc/issue.class.php:926
470473
msgid "No task"
471474
msgstr "Žádný úkol"

‎locales/en_GB.mo

0 Bytes
Binary file not shown.

‎locales/en_GB.po

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# English translations for PACKAGE package.
2-
# Copyright (C) 2018 THE PACKAGE'S COPYRIGHT HOLDER
2+
# Copyright (C) 2019 THE PACKAGE'S COPYRIGHT HOLDER
33
# This file is distributed under the same license as the PACKAGE package.
4-
# Automatically generated, 2018.
4+
# Automatically generated, 2019.
55
#
66
msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-08-21 14:59+0000\n"
11-
"PO-Revision-Date: 2018-08-21 14:59+0000\n"
10+
"POT-Creation-Date: 2019-07-08 13:00+0000\n"
11+
"PO-Revision-Date: 2019-07-08 13:00+0000\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
1414
"Language: en_GB\n"
@@ -443,7 +443,7 @@ msgstr "Category = %1$s <br/>"
443443
msgid "Link to GLPi object = %1$s <br/>"
444444
msgstr "Link to GLPi object = %1$s <br/>"
445445

446-
#: inc/issue.class.php:875
446+
#: inc/issue.class.php:876
447447
#, php-format
448448
msgid ""
449449
"Followups = %1$s -> date : %2$s, request type : %3$s, user : %4$s, content : "
@@ -452,15 +452,15 @@ msgstr ""
452452
"Followups = %1$s -> date : %2$s, request type : %3$s, user : %4$s, content : "
453453
"%5$s<br/>"
454454

455-
#: inc/issue.class.php:883
455+
#: inc/issue.class.php:884
456456
msgid "No follow-up"
457457
msgstr "No follow-up"
458458

459-
#: inc/issue.class.php:918
459+
#: inc/issue.class.php:919
460460
#, php-format
461461
msgid "Task = %1$s -> date : %2$s, description : %3$s, time : %4$s<br/>"
462462
msgstr "Task = %1$s -> date : %2$s, description : %3$s, time : %4$s<br/>"
463463

464-
#: inc/issue.class.php:925
464+
#: inc/issue.class.php:926
465465
msgid "No task"
466466
msgstr "No task"

‎locales/fr_FR.mo

-2 Bytes
Binary file not shown.

‎locales/fr_FR.po

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
55
#
6+
# Translators:
7+
# Legastelois François <flegastelois@teclib.com>, 2018
8+
# Cédric Anne, 2018
9+
#
610
#, fuzzy
711
msgid ""
812
msgstr ""
913
"Project-Id-Version: PACKAGE VERSION\n"
1014
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-08-21 14:59+0000\n"
12-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
15+
"POT-Creation-Date: 2019-07-08 13:00+0000\n"
16+
"PO-Revision-Date: 2016-10-05 17:06+0000\n"
1317
"Last-Translator: Cédric Anne, 2018\n"
1418
"Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n"
1519
"MIME-Version: 1.0\n"
16-
"Content-Type: text/plain; charset=CHARSET\n"
20+
"Content-Type: text/plain; charset=UTF-8\n"
1721
"Content-Transfer-Encoding: 8bit\n"
1822
"Language: fr_FR\n"
1923
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -461,7 +465,7 @@ msgstr "Catégorie = %1$s <br />"
461465
msgid "Link to GLPi object = %1$s <br/>"
462466
msgstr "Lien vers l'objet GLPI = %1$s <br />"
463467

464-
#: inc/issue.class.php:875
468+
#: inc/issue.class.php:876
465469
#, php-format
466470
msgid ""
467471
"Followups = %1$s -> date : %2$s, request type : %3$s, user : %4$s, content :"
@@ -470,16 +474,16 @@ msgstr ""
470474
"Suivi GLPI = %1$s -> Date : %2$s, Type : %3$s, Demandeur : %4$s, Description"
471475
" : %5$s<br />"
472476

473-
#: inc/issue.class.php:883
477+
#: inc/issue.class.php:884
474478
msgid "No follow-up"
475479
msgstr "Aucun suivi"
476480

477-
#: inc/issue.class.php:918
481+
#: inc/issue.class.php:919
478482
#, php-format
479483
msgid "Task = %1$s -> date : %2$s, description : %3$s, time : %4$s<br/>"
480484
msgstr ""
481485
"Tâche GLPI = %1$s -> Date : %2$s, Description : %3$s, Durée : %4$s<br />"
482486

483-
#: inc/issue.class.php:925
487+
#: inc/issue.class.php:926
484488
msgid "No task"
485489
msgstr "Aucune tâche"

‎locales/mantis.pot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-08-21 14:59+0000\n"
11+
"POT-Creation-Date: 2019-07-08 13:00+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -438,22 +438,22 @@ msgstr ""
438438
msgid "Link to GLPi object = %1$s <br/>"
439439
msgstr ""
440440

441-
#: inc/issue.class.php:875
441+
#: inc/issue.class.php:876
442442
#, php-format
443443
msgid ""
444444
"Followups = %1$s -> date : %2$s, request type : %3$s, user : %4$s, content : "
445445
"%5$s<br/>"
446446
msgstr ""
447447

448-
#: inc/issue.class.php:883
448+
#: inc/issue.class.php:884
449449
msgid "No follow-up"
450450
msgstr ""
451451

452-
#: inc/issue.class.php:918
452+
#: inc/issue.class.php:919
453453
#, php-format
454454
msgid "Task = %1$s -> date : %2$s, description : %3$s, time : %4$s<br/>"
455455
msgstr ""
456456

457-
#: inc/issue.class.php:925
457+
#: inc/issue.class.php:926
458458
msgid "No task"
459459
msgstr ""

‎locales/pt_BR.mo

49 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)