Skip to content

Commit

Permalink
Merge branch 'release/1.12.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Mar 9, 2021
2 parents d118fd8 + 9c4f3bc commit f51c2ba
Show file tree
Hide file tree
Showing 26 changed files with 324 additions and 451 deletions.
319 changes: 93 additions & 226 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inc/field.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ static function prepareHtmlFields($fields, $items_id, $itemtype, $canedit = true
break;
case 'dropdownoperatingsystems':
if ($massiveaction) {
continue;
break;
}
if ($canedit && !$readonly) {
$html.= OperatingSystem::dropdown(['name' => $field['name'],
Expand Down
22 changes: 11 additions & 11 deletions locales/cs_CZ.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Plugin - Fields\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-27 14:42+0000\n"
"POT-Creation-Date: 2021-03-09 14:29+0000\n"
"PO-Revision-Date: 2020-10-27 14:43+0000\n"
"Last-Translator: Cédric Anne\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/cs_CZ/)\n"
Expand Down Expand Up @@ -161,42 +161,42 @@ msgstr "Nastavit"
msgid "Configure fields values"
msgstr "Nastavit hodnoty kolonek"

#: inc/field.class.php:751
#: inc/field.class.php:753
msgid "show"
msgstr "zobrazit"

#: inc/field.class.php:897
#: inc/field.class.php:916
msgid "Header"
msgstr "Hlavička"

#: inc/field.class.php:898
#: inc/field.class.php:917
msgid "Text (single line)"
msgstr "Text (jednořádkový)"

#: inc/field.class.php:899
#: inc/field.class.php:918
msgid "Text (multiples lines)"
msgstr "Text (víceřádkový)"

#: inc/field.class.php:900
#: inc/field.class.php:919
msgid "Number"
msgstr "Číslo"

#: inc/field.class.php:901
#: inc/field.class.php:920
msgid "URL"
msgstr "URL adresa"

#: inc/field.class.php:902
#: inc/field.class.php:921
msgid "Dropdown"
msgstr "Rozbalovací"

#: inc/field.class.php:903
#: inc/field.class.php:922
msgid "Yes/No"
msgstr "Ano/Ne"

#: inc/field.class.php:904
#: inc/field.class.php:923
msgid "Date"
msgstr "Datum"

#: inc/field.class.php:905
#: inc/field.class.php:924
msgid "Date & time"
msgstr "Datum a čas"
Binary file modified locales/en_GB.mo
Binary file not shown.
28 changes: 14 additions & 14 deletions locales/en_GB.po
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# English translations for PACKAGE package.
# Copyright (C) 2020 THE PACKAGE'S COPYRIGHT HOLDER
# Copyright (C) 2021 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Automatically generated, 2020.
# Automatically generated, 2021.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-27 14:42+0000\n"
"PO-Revision-Date: 2020-10-27 14:42+0000\n"
"POT-Creation-Date: 2021-03-09 14:29+0000\n"
"PO-Revision-Date: 2021-03-09 14:29+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en_GB\n"
Expand Down Expand Up @@ -166,42 +166,42 @@ msgstr "Configure"
msgid "Configure fields values"
msgstr "Configure fields values"

#: inc/field.class.php:751
#: inc/field.class.php:753
msgid "show"
msgstr "show"

#: inc/field.class.php:897
#: inc/field.class.php:916
msgid "Header"
msgstr "Header"

#: inc/field.class.php:898
#: inc/field.class.php:917
msgid "Text (single line)"
msgstr "Text (single line)"

#: inc/field.class.php:899
#: inc/field.class.php:918
msgid "Text (multiples lines)"
msgstr "Text (multiples lines)"

#: inc/field.class.php:900
#: inc/field.class.php:919
msgid "Number"
msgstr "Number"

#: inc/field.class.php:901
#: inc/field.class.php:920
msgid "URL"
msgstr "URL"

#: inc/field.class.php:902
#: inc/field.class.php:921
msgid "Dropdown"
msgstr "Dropdown"

#: inc/field.class.php:903
#: inc/field.class.php:922
msgid "Yes/No"
msgstr "Yes/No"

#: inc/field.class.php:904
#: inc/field.class.php:923
msgid "Date"
msgstr "Date"

#: inc/field.class.php:905
#: inc/field.class.php:924
msgid "Date & time"
msgstr "Date & time"
22 changes: 11 additions & 11 deletions locales/en_US.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Plugin - Fields\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-27 14:42+0000\n"
"POT-Creation-Date: 2021-03-09 14:29+0000\n"
"PO-Revision-Date: 2020-10-27 14:43+0000\n"
"Last-Translator: Cédric Anne\n"
"Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/en_US/)\n"
Expand Down Expand Up @@ -160,42 +160,42 @@ msgstr "Configure"
msgid "Configure fields values"
msgstr "Configure Fields Values"

#: inc/field.class.php:751
#: inc/field.class.php:753
msgid "show"
msgstr "show"

#: inc/field.class.php:897
#: inc/field.class.php:916
msgid "Header"
msgstr "Header"

#: inc/field.class.php:898
#: inc/field.class.php:917
msgid "Text (single line)"
msgstr "Text (single line)"

#: inc/field.class.php:899
#: inc/field.class.php:918
msgid "Text (multiples lines)"
msgstr "Text (multiples lines)"

#: inc/field.class.php:900
#: inc/field.class.php:919
msgid "Number"
msgstr "Number"

#: inc/field.class.php:901
#: inc/field.class.php:920
msgid "URL"
msgstr "URL"

#: inc/field.class.php:902
#: inc/field.class.php:921
msgid "Dropdown"
msgstr "Dropdown"

#: inc/field.class.php:903
#: inc/field.class.php:922
msgid "Yes/No"
msgstr "Yes/No"

#: inc/field.class.php:904
#: inc/field.class.php:923
msgid "Date"
msgstr "Date"

#: inc/field.class.php:905
#: inc/field.class.php:924
msgid "Date & time"
msgstr "Date & Time"
22 changes: 11 additions & 11 deletions locales/es_ES.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Plugin - Fields\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-27 14:42+0000\n"
"POT-Creation-Date: 2021-03-09 14:29+0000\n"
"PO-Revision-Date: 2020-10-27 14:43+0000\n"
"Last-Translator: Cédric Anne\n"
"Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/es_ES/)\n"
Expand Down Expand Up @@ -162,42 +162,42 @@ msgstr "Configurar"
msgid "Configure fields values"
msgstr "Configure valores de los campos"

#: inc/field.class.php:751
#: inc/field.class.php:753
msgid "show"
msgstr "mostrar"

#: inc/field.class.php:897
#: inc/field.class.php:916
msgid "Header"
msgstr "Encabezamiento"

#: inc/field.class.php:898
#: inc/field.class.php:917
msgid "Text (single line)"
msgstr "Texto (línea simple)"

#: inc/field.class.php:899
#: inc/field.class.php:918
msgid "Text (multiples lines)"
msgstr "Texto (multiples líneas)"

#: inc/field.class.php:900
#: inc/field.class.php:919
msgid "Number"
msgstr "Número"

#: inc/field.class.php:901
#: inc/field.class.php:920
msgid "URL"
msgstr "URL"

#: inc/field.class.php:902
#: inc/field.class.php:921
msgid "Dropdown"
msgstr "Menú desplegable"

#: inc/field.class.php:903
#: inc/field.class.php:922
msgid "Yes/No"
msgstr "Si/No"

#: inc/field.class.php:904
#: inc/field.class.php:923
msgid "Date"
msgstr "Fecha"

#: inc/field.class.php:905
#: inc/field.class.php:924
msgid "Date & time"
msgstr "Fecha & Hora"
22 changes: 11 additions & 11 deletions locales/fi_FI.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Plugin - Fields\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-27 14:42+0000\n"
"POT-Creation-Date: 2021-03-09 14:29+0000\n"
"PO-Revision-Date: 2020-10-27 14:43+0000\n"
"Last-Translator: Cédric Anne\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/fi_FI/)\n"
Expand Down Expand Up @@ -159,42 +159,42 @@ msgstr "Määritä"
msgid "Configure fields values"
msgstr "Määritä kenttien arvot"

#: inc/field.class.php:751
#: inc/field.class.php:753
msgid "show"
msgstr "näytä"

#: inc/field.class.php:897
#: inc/field.class.php:916
msgid "Header"
msgstr "Ylätunniste"

#: inc/field.class.php:898
#: inc/field.class.php:917
msgid "Text (single line)"
msgstr "Teksti (yksi rivi)"

#: inc/field.class.php:899
#: inc/field.class.php:918
msgid "Text (multiples lines)"
msgstr "Teksti (useita rivejä)"

#: inc/field.class.php:900
#: inc/field.class.php:919
msgid "Number"
msgstr "Numero"

#: inc/field.class.php:901
#: inc/field.class.php:920
msgid "URL"
msgstr "URL"

#: inc/field.class.php:902
#: inc/field.class.php:921
msgid "Dropdown"
msgstr "Pudotusvalikko"

#: inc/field.class.php:903
#: inc/field.class.php:922
msgid "Yes/No"
msgstr "Kyllä/Ei"

#: inc/field.class.php:904
#: inc/field.class.php:923
msgid "Date"
msgstr "Päivämäärä"

#: inc/field.class.php:905
#: inc/field.class.php:924
msgid "Date & time"
msgstr "Päivämäärä ja aika"
22 changes: 11 additions & 11 deletions locales/fields.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-27 14:42+0000\n"
"POT-Creation-Date: 2021-03-09 14:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -158,42 +158,42 @@ msgstr ""
msgid "Configure fields values"
msgstr ""

#: inc/field.class.php:751
#: inc/field.class.php:753
msgid "show"
msgstr ""

#: inc/field.class.php:897
#: inc/field.class.php:916
msgid "Header"
msgstr ""

#: inc/field.class.php:898
#: inc/field.class.php:917
msgid "Text (single line)"
msgstr ""

#: inc/field.class.php:899
#: inc/field.class.php:918
msgid "Text (multiples lines)"
msgstr ""

#: inc/field.class.php:900
#: inc/field.class.php:919
msgid "Number"
msgstr ""

#: inc/field.class.php:901
#: inc/field.class.php:920
msgid "URL"
msgstr ""

#: inc/field.class.php:902
#: inc/field.class.php:921
msgid "Dropdown"
msgstr ""

#: inc/field.class.php:903
#: inc/field.class.php:922
msgid "Yes/No"
msgstr ""

#: inc/field.class.php:904
#: inc/field.class.php:923
msgid "Date"
msgstr ""

#: inc/field.class.php:905
#: inc/field.class.php:924
msgid "Date & time"
msgstr ""
Loading

0 comments on commit f51c2ba

Please sign in to comment.