Skip to content

Commit

Permalink
Merge branch 'release/2.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Feb 7, 2020
2 parents b80b017 + 83888b5 commit 454cc19
Show file tree
Hide file tree
Showing 17 changed files with 551 additions and 150 deletions.
388 changes: 274 additions & 114 deletions composer.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions inc/config.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,17 +167,17 @@ static function showConfigForm($item) {

echo "<tr class='tab_bg_1'>";
echo "<td>".__("Server hostname (MSSQL)", "sccm")."</td><td>";
Html::autocompletionTextField($config, 'sccmdb_host');
echo Html::input('sccmdb_host', ['value' => $config->getField('sccmdb_host')]);
echo "</td></tr>\n";

echo "<tr class='tab_bg_1'>";
echo "<td>".__("Database name", "sccm")."</td><td>";
Html::autocompletionTextField($config, 'sccmdb_dbname');
echo Html::input('sccmdb_dbname', ['value' => $config->getField('sccmdb_dbname')]);
echo "</td></tr>\n";

echo "<tr class='tab_bg_1'>";
echo "<td>".__("Username", "sccm")."</td><td>";
Html::autocompletionTextField($config, 'sccmdb_user');
echo Html::input('sccmdb_user', ['value' => $config->getField('sccmdb_user')]);
echo "</td></tr>\n";

$password = $config->getField('sccmdb_password');
Expand All @@ -189,7 +189,7 @@ static function showConfigForm($item) {

echo "<tr class='tab_bg_1'>";
echo "<td>".__("URL FusionInventory for injection", "sccm")."</td><td>";
Html::autocompletionTextField($config, 'fusioninventory_url');
echo Html::input('fusioninventory_url', ['value' => $config->getField('fusioninventory_url')]);
echo "</td></tr>\n";

echo "<tr class='tab_bg_1'>";
Expand All @@ -214,7 +214,7 @@ static function showConfigForm($item) {

echo "<tr class='tab_bg_1'>";
echo "<td>".__("Value for spécific authentication", "sccm")."</td><td>";
Html::autocompletionTextField($config, 'auth_info');
echo Html::input('auth_info', ['value' => $config->getField('auth_info')]);
echo "</td></tr>\n";

$config->showFormButtons(['candel'=>false]);
Expand Down
Binary file modified locales/cs_CZ.mo
Binary file not shown.
15 changes: 9 additions & 6 deletions locales/cs_CZ.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Pavel Borecki <[email protected]>, 2018
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-21 14:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2020-02-07 09:49+0000\n"
"PO-Revision-Date: 2018-08-21 14:04+0000\n"
"Last-Translator: Pavel Borecki <[email protected]>, 2018\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -94,18 +97,18 @@ msgstr "SCCM"
msgid "Please, read the documentation before using that."
msgstr "Před použitím si přečtete dokumentaci."

#: inc/sccm.class.php:506
#: inc/sccm.class.php:504
msgid "Interface - SCCMCollect"
msgstr "Rozhraní – SCCMCollect"

#: inc/sccm.class.php:509
#: inc/sccm.class.php:507
msgid "Interface - SCCMPush"
msgstr "Rozhraní – SCCMPush"

#: inc/sccm.class.php:562
#: inc/sccm.class.php:560
msgid "Collect is disabled by configuration."
msgstr "Shromažďování je vypnuté nastavením."

#: inc/sccm.class.php:652
#: inc/sccm.class.php:651
msgid "Push is disabled by configuration."
msgstr "Odesílání je vypnuté nastavením."
Binary file modified locales/en_GB.mo
Binary file not shown.
16 changes: 8 additions & 8 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) 2018 THE PACKAGE'S COPYRIGHT HOLDER
# Copyright (C) 2020 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Automatically generated, 2018.
# Automatically generated, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-21 14:05+0000\n"
"PO-Revision-Date: 2018-08-21 14:05+0000\n"
"POT-Creation-Date: 2020-02-07 09:49+0000\n"
"PO-Revision-Date: 2020-02-07 09:49+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en_GB\n"
Expand Down Expand Up @@ -93,18 +93,18 @@ msgstr "SCCM"
msgid "Please, read the documentation before using that."
msgstr "Please, read the documentation before using that."

#: inc/sccm.class.php:506
#: inc/sccm.class.php:504
msgid "Interface - SCCMCollect"
msgstr "Interface - SCCMCollect"

#: inc/sccm.class.php:509
#: inc/sccm.class.php:507
msgid "Interface - SCCMPush"
msgstr "Interface - SCCMPush"

#: inc/sccm.class.php:562
#: inc/sccm.class.php:560
msgid "Collect is disabled by configuration."
msgstr "Collect is disabled by configuration."

#: inc/sccm.class.php:652
#: inc/sccm.class.php:651
msgid "Push is disabled by configuration."
msgstr "Push is disabled by configuration."
Binary file modified locales/fi_FI.mo
Binary file not shown.
10 changes: 5 additions & 5 deletions locales/fi_FI.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-21 14:05+0000\n"
"POT-Creation-Date: 2020-02-07 09:49+0000\n"
"PO-Revision-Date: 2018-08-21 14:04+0000\n"
"Last-Translator: Markku Vepsä, 2018\n"
"Language-Team: Finnish (Finland) (https://www.transifex.com/teclib/teams/28042/fi_FI/)\n"
Expand Down Expand Up @@ -97,18 +97,18 @@ msgstr "SCCM"
msgid "Please, read the documentation before using that."
msgstr "Lue käyttöohjeet ennen käyttöä."

#: inc/sccm.class.php:506
#: inc/sccm.class.php:504
msgid "Interface - SCCMCollect"
msgstr "Liitäntä - SCCMCollect"

#: inc/sccm.class.php:509
#: inc/sccm.class.php:507
msgid "Interface - SCCMPush"
msgstr "Liitäntä - SCCMPush"

#: inc/sccm.class.php:562
#: inc/sccm.class.php:560
msgid "Collect is disabled by configuration."
msgstr "\"Collect\" on poistettu käytöstä asetusten perusteella."

#: inc/sccm.class.php:652
#: inc/sccm.class.php:651
msgid "Push is disabled by configuration."
msgstr "\"Push\" on poistettu käytöstä asetusten perusteella."
Binary file modified locales/fr_FR.mo
Binary file not shown.
15 changes: 9 additions & 6 deletions locales/fr_FR.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Cédric Anne, 2018
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-21 14:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2020-02-07 09:49+0000\n"
"PO-Revision-Date: 2018-08-21 14:04+0000\n"
"Last-Translator: Cédric Anne, 2018\n"
"Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -94,18 +97,18 @@ msgstr "SCCM"
msgid "Please, read the documentation before using that."
msgstr "Merci de lire la documentation avant d'utiliser cette URL."

#: inc/sccm.class.php:506
#: inc/sccm.class.php:504
msgid "Interface - SCCMCollect"
msgstr "Interface - SCCMCollect"

#: inc/sccm.class.php:509
#: inc/sccm.class.php:507
msgid "Interface - SCCMPush"
msgstr "Interface - SCCMPush"

#: inc/sccm.class.php:562
#: inc/sccm.class.php:560
msgid "Collect is disabled by configuration."
msgstr "La collecte est désactivé par la configuration"

#: inc/sccm.class.php:652
#: inc/sccm.class.php:651
msgid "Push is disabled by configuration."
msgstr "L'implantation est désactivé par la configuration"
Binary file added locales/it_IT.mo
Binary file not shown.
114 changes: 114 additions & 0 deletions locales/it_IT.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Cédric Anne, 2019
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-02-07 09:49+0000\n"
"PO-Revision-Date: 2018-08-21 14:04+0000\n"
"Last-Translator: Cédric Anne, 2019\n"
"Language-Team: Italian (Italy) (https://www.transifex.com/teclib/teams/28042/it_IT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: it_IT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: front/showtable.php:81
msgid "Synchronization is disabled by configuration."
msgstr "La sincronizzazione è disabilitata dalla configurazione."

#: front/config.form.php:31 inc/config.class.php:47
msgid "Setup - SCCM"
msgstr "Installazione - SCCM"

#: front/test.php:32
msgid "SCCM - TEST"
msgstr "SCCM - TEST"

#: inc/config.class.php:51 setup.php:58
msgid "Interface - SCCM"
msgstr "Interfaccia - SCCM"

#: inc/config.class.php:99 inc/config.class.php:110
msgid "Error when using glpi_plugin_sccm_configs table."
msgstr "Errore durante l'utilizzo della tabella glpi_plugin_sccm_configs."

#: inc/config.class.php:164
msgid "Enable SCCM synchronization"
msgstr "Abilita sincronizzazione SCCM"

#: inc/config.class.php:169
msgid "Server hostname (MSSQL)"
msgstr "Nome del server (MSSQL)"

#: inc/config.class.php:174
msgid "Database name"
msgstr "Nome del database"

#: inc/config.class.php:179
msgid "Username"
msgstr "Nome utente"

#: inc/config.class.php:186
msgid "Password"
msgstr "Password"

#: inc/config.class.php:191
msgid "URL FusionInventory for injection"
msgstr "URL FusionInventory per l'aggiunta"

#: inc/config.class.php:196
msgid "Verify SSL certificate"
msgstr "Verifica certificato SSL"

#: inc/config.class.php:201
msgid "Use NLTM authentication"
msgstr "Usa autenticazione NLTM"

#: inc/config.class.php:206
msgid "Send credentials to other hosts too"
msgstr "Invia credenziali anche ad altri host"

#: inc/config.class.php:211
msgid "Use specific authentication information"
msgstr "Usa informazioni di autenticazione specifiche"

#: inc/config.class.php:216
msgid "Value for spécific authentication"
msgstr "Valore per l'autenticazione specifica"

#: inc/menu.class.php:29 inc/menu.class.php:33
msgid "SCCM Connector"
msgstr "Connettore SCCM"

#: inc/sccm.class.php:35
msgid "SCCM"
msgstr "SCCM"

#: inc/sccm.class.php:39
msgid "Please, read the documentation before using that."
msgstr "Per favore, leggi la documentazione prima di usarla."

#: inc/sccm.class.php:504
msgid "Interface - SCCMCollect"
msgstr "Interfaccia: SCCMCollect"

#: inc/sccm.class.php:507
msgid "Interface - SCCMPush"
msgstr "Interfaccia: SCCMPush"

#: inc/sccm.class.php:560
msgid "Collect is disabled by configuration."
msgstr "La raccolta è disabilitata dalla configurazione."

#: inc/sccm.class.php:651
msgid "Push is disabled by configuration."
msgstr "Push è disabilitato dalla configurazione."
Binary file added locales/pt_PT.mo
Binary file not shown.
Loading

0 comments on commit 454cc19

Please sign in to comment.