diff --git a/datainjection.xml b/datainjection.xml
index 7ecaacdc..215f7b8e 100644
--- a/datainjection.xml
+++ b/datainjection.xml
@@ -6,12 +6,14 @@
https://raw.githubusercontent.com/pluginsGLPI/datainjection/master/datainjection.png
-
+
+
+ - import dat pocházejících z jiných softwarů pro správu majetku
- import formulářů elektronického doručení
Data k importu pomocí tohoto zásuvného modulu jsou:
- data inventáře (s výjimkou software a licencí)
- správní data (smlouvy, kontakty, dodavatelé)
- data nastavení (uživatel, skupina, entita)]]>
+ - import data coming from others asset management softwares
- inject electronic delivery forms
Data to be imported using the plugin are:
- inventory data (except softwares and licenses)
- management data (contract, contact, supplier)
- configuration data (user, group, entity)]]>
- reprise des données d'autres outils d'inventaires
- injection de bons de livraisons électroniques
Les données pouvant-être injectées sont :
- données d'inventaires (sauf logiciels et licences)
- données de gestion (contrat, contact, fournisseur)
- données de configuration (utilisateur, groupe, entité)]]>
- - import data coming from others asset management softwares
- inject electronic delivery forms
Data to be imported using the plugains are:
- inventory data (except softwares and licenses)
- management data (contract, contact, supplier)
- configuration data (user, group, entity)]]>
http://plugins.glpi-project.org/#/plugin/datainjection
@@ -25,6 +27,10 @@
Xavier Caillaud
+
+ 2.6.2
+ 9.3
+
2.6.1
9.3
@@ -168,25 +174,35 @@
- fr_FR
+ cs_CZ
en_GB
es_ES
- ru_RU
+ fi_Fi
+ fr_FR
+ pt_BR
+ tr_TR
+ zh_CN
injection/import
-
- Import
- données
+
+ import
+ data
csv
- entités
-
+ entity
+
Injection
data
csv
entities
+
+ Import
+ données
+ csv
+ entités
+
GPL v2+
diff --git a/hook.php b/hook.php
index fa6fbc38..a5430f72 100644
--- a/hook.php
+++ b/hook.php
@@ -84,7 +84,7 @@ function plugin_datainjection_install() {
`port_unicity` tinyint( 1 ) NOT NULL DEFAULT '0',
`step` int( 11 ) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
- ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_unicode_ci";
+ ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_unicode_ci";
$DB->queryOrDie($query, $DB->error());
$query = "CREATE TABLE IF NOT EXISTS `glpi_plugin_datainjection_modelcsvs` (
@@ -94,7 +94,7 @@ function plugin_datainjection_install() {
`delimiter` varchar(1) NOT NULL default ';',
`is_header_present` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`ID`)
- ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_unicode_ci;";
+ ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_unicode_ci;";
$DB->queryOrDie($query, $DB->error());
$query = "CREATE TABLE IF NOT EXISTS `glpi_plugin_datainjection_mappings` (
@@ -1717,8 +1717,7 @@ function plugin_datainjection_update210_220() {
function plugin_datainjection_update220_230() {
global $DB;
- if (countElementsInTable("glpi_plugin_datainjection_models",
- "`entities_id`='-1'")) {
+ if (countElementsInTable("glpi_plugin_datainjection_models", ['entities_id' => -1])) {
$query = "UPDATE `glpi_plugin_datainjection_models`
SET `is_private` = '1',
`entities_id` = '0',
diff --git a/inc/commoninjectionlib.class.php b/inc/commoninjectionlib.class.php
index a063364e..f21ebfef 100644
--- a/inc/commoninjectionlib.class.php
+++ b/inc/commoninjectionlib.class.php
@@ -349,57 +349,51 @@ static function getBlacklistedOptions($itemtype) {
// 80 : entity
$blacklist = [2, 19, 80, 201, 202, 203, 204];
+ $raw_options_to_blacklist = [];
+
//add document fields
if (in_array($itemtype, $CFG_GLPI["document_types"])) {
- $tabs = Document::rawSearchOptionsToAdd();
- $document_fields = [];
- unset($tabs['document']);
- foreach ($tabs as $k => $v) {
- $document_fields[] = $k;
- }
-
- $blacklist = array_merge($blacklist, $document_fields);
+ $raw_options_to_blacklist = array_merge(
+ $raw_options_to_blacklist,
+ Document::rawSearchOptionsToAdd($itemtype)
+ );
}
//add infocoms fields
if (in_array($itemtype, $CFG_GLPI["infocom_types"])) {
- $tabs = Infocom::rawSearchOptionsToAdd($itemtype);
- $infocom_fields = [];
- unset($tabs['financial']);
- foreach ($tabs as $k => $v) {
- $infocom_fields[] = $k;
- }
-
- $blacklist = array_merge($blacklist, $infocom_fields);
+ $raw_options_to_blacklist = array_merge(
+ $raw_options_to_blacklist,
+ Infocom::rawSearchOptionsToAdd($itemtype)
+ );
}
+
//add contract fields
if (in_array($itemtype, $CFG_GLPI["contract_types"])) {
- $tabs = Contract::rawSearchOptionsToAdd();
- $contract_fields = [];
- unset($tabs['contract']);
- foreach ($tabs as $k => $v) {
- $contract_fields[] = $k;
- }
-
- $blacklist = array_merge($blacklist, $contract_fields);
+ $raw_options_to_blacklist = array_merge(
+ $raw_options_to_blacklist,
+ Contract::rawSearchOptionsToAdd($itemtype)
+ );
}
//add networkport fields
if (in_array($itemtype, $CFG_GLPI["networkport_types"])) {
- $tabs = NetworkPort::rawSearchOptionsToAdd($itemtype);
- $networkport_fields = [];
- unset($tabs['network']);
- foreach ($tabs as $k => $v) {
- $networkport_fields[] = $k;
- }
+ $raw_options_to_blacklist = array_merge(
+ $raw_options_to_blacklist,
+ NetworkPort::rawSearchOptionsToAdd($itemtype)
+ );
+ }
- $blacklist = array_merge($blacklist, $networkport_fields);
+ foreach ($raw_options_to_blacklist as $raw_option) {
+ if (!is_numeric($raw_option['id'])) {
+ continue;
+ }
+ $blacklist[] = $raw_option['id'];
}
//add ticket_types fields
if (in_array($itemtype, $CFG_GLPI["ticket_types"])) {
- $ticket_fields = [60, 140];
- $blacklist = array_merge($blacklist, $ticket_fields);
+ $blacklist[] = 60;
+ $blacklist[] = 140;
}
return $blacklist;
diff --git a/inc/devicecaseinjection.class.php b/inc/devicecaseinjection.class.php
index 07087a86..75e595fa 100644
--- a/inc/devicecaseinjection.class.php
+++ b/inc/devicecaseinjection.class.php
@@ -89,9 +89,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
if (!countElementsInTable(
$item->getTable(),
- "`$foreign`='".$values[get_parent_class($this)]['id']."'
- AND `itemtype`='Computer'
- AND `items_id`='".$values['Computer']['id']."'"
+ [
+ $foreign => $values[get_parent_class($this)]['id'],
+ 'itemtype' => 'Computer',
+ 'items_id' => $values['Computer']['id'],
+ ]
)) {
$tmp[$foreign] = $values[get_parent_class($this)]['id'];
$tmp['items_id'] = $values['Computer']['id'];
diff --git a/inc/devicecontrolinjection.class.php b/inc/devicecontrolinjection.class.php
index a6f8cb5c..fd6f045d 100644
--- a/inc/devicecontrolinjection.class.php
+++ b/inc/devicecontrolinjection.class.php
@@ -91,9 +91,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
if (!countElementsInTable(
$item->getTable(),
- "`$foreign`='".$values[get_parent_class($this)]['id']."'
- AND `itemtype`='Computer'
- AND `items_id`='".$values['Computer']['id']."'"
+ [
+ $foreign => $values[get_parent_class($this)]['id'],
+ 'itemtype' => 'Computer',
+ 'items_id' => $values['Computer']['id'],
+ ]
)) {
$tmp[$foreign] = $values[get_parent_class($this)]['id'];
$tmp['items_id'] = $values['Computer']['id'];
diff --git a/inc/devicedriveinjection.class.php b/inc/devicedriveinjection.class.php
index cab56940..657f175d 100644
--- a/inc/devicedriveinjection.class.php
+++ b/inc/devicedriveinjection.class.php
@@ -91,9 +91,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
if (!countElementsInTable(
$item->getTable(),
- "`$foreign`='".$values[get_parent_class($this)]['id']."'
- AND `itemtype`='Computer'
- AND `items_id`='".$values['Computer']['id']."'"
+ [
+ $foreign => $values[get_parent_class($this)]['id'],
+ 'itemtype' => 'Computer',
+ 'items_id' => $values['Computer']['id'],
+ ]
)) {
$tmp[$foreign] = $values[get_parent_class($this)]['id'];
$tmp['items_id'] = $values['Computer']['id'];
diff --git a/inc/deviceharddriveinjection.class.php b/inc/deviceharddriveinjection.class.php
index e3da0581..e5c56238 100644
--- a/inc/deviceharddriveinjection.class.php
+++ b/inc/deviceharddriveinjection.class.php
@@ -89,9 +89,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
if (!countElementsInTable(
$item->getTable(),
- "`$foreign`='".$values[get_parent_class($this)]['id']."'
- AND `itemtype`='Computer'
- AND `items_id`='".$values['Computer']['id']."'"
+ [
+ $foreign => $values[get_parent_class($this)]['id'],
+ 'itemtype' => 'Computer',
+ 'items_id' => $values['Computer']['id'],
+ ]
)) {
$tmp[$foreign] = $values[get_parent_class($this)]['id'];
$tmp['items_id'] = $values['Computer']['id'];
diff --git a/inc/devicememoryinjection.class.php b/inc/devicememoryinjection.class.php
index a8823d05..71bee1f4 100644
--- a/inc/devicememoryinjection.class.php
+++ b/inc/devicememoryinjection.class.php
@@ -87,9 +87,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
$item = new $class();
$foreign = getForeignKeyFieldForTable(getTableForItemType(get_parent_class($this)));
- $where = "`$foreign`='".$values[get_parent_class($this)]['id']."'
- AND `itemtype`='Computer'
- AND `items_id`='".$values['Computer']['id']."'";
+ $where = [
+ $foreign => $values[get_parent_class($this)]['id'],
+ 'itemtype' => 'Computer',
+ 'items_id' => $values['Computer']['id'],
+ ];
if (!countElementsInTable($item->getTable(), $where)) {
diff --git a/inc/devicemotherboardinjection.class.php b/inc/devicemotherboardinjection.class.php
index 9873bbbd..e8cafc6f 100644
--- a/inc/devicemotherboardinjection.class.php
+++ b/inc/devicemotherboardinjection.class.php
@@ -89,9 +89,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
if (!countElementsInTable(
$item->getTable(),
- "`$foreign`='".$values[get_parent_class($this)]['id']."'
- AND `itemtype`='Computer'
- AND `items_id`='".$values['Computer']['id']."'"
+ [
+ $foreign => $values[get_parent_class($this)]['id'],
+ 'itemtype' => 'Computer',
+ 'items_id' => $values['Computer']['id'],
+ ]
)) {
$tmp[$foreign] = $values[get_parent_class($this)]['id'];
$tmp['items_id'] = $values['Computer']['id'];
diff --git a/inc/devicenetworkcardinjection.class.php b/inc/devicenetworkcardinjection.class.php
index 1e17cc66..7726ad67 100644
--- a/inc/devicenetworkcardinjection.class.php
+++ b/inc/devicenetworkcardinjection.class.php
@@ -89,9 +89,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
if (!countElementsInTable(
$item->getTable(),
- "`$foreign`='".$values[get_parent_class($this)]['id']."'
- AND `itemtype`='Computer'
- AND `items_id`='".$values['Computer']['id']."'"
+ [
+ $foreign => $values[get_parent_class($this)]['id'],
+ 'itemtype' => 'Computer',
+ 'items_id' => $values['Computer']['id'],
+ ]
)) {
$tmp[$foreign] = $values[get_parent_class($this)]['id'];
$tmp['items_id'] = $values['Computer']['id'];
diff --git a/inc/deviceprocessorinjection.class.php b/inc/deviceprocessorinjection.class.php
index 98b4a591..5661250c 100644
--- a/inc/deviceprocessorinjection.class.php
+++ b/inc/deviceprocessorinjection.class.php
@@ -87,9 +87,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
$item = new $class();
$foreign = getForeignKeyFieldForTable(getTableForItemType(get_parent_class($this)));
- $where = "`$foreign`='".$values[get_parent_class($this)]['id']."'
- AND `itemtype`='Computer'
- AND `items_id`='".$values['Computer']['id']."'";
+ $where = [
+ $foreign => $values[get_parent_class($this)]['id'],
+ 'itemtype' => 'Computer',
+ 'items_id' => $values['Computer']['id'],
+ ];
if (!countElementsInTable($item->getTable(), $where)) {
diff --git a/inc/entityinjection.class.php b/inc/entityinjection.class.php
index 1cf391b1..627ea7a9 100644
--- a/inc/entityinjection.class.php
+++ b/inc/entityinjection.class.php
@@ -130,7 +130,7 @@ function customimport($input = [], $add = true, $rights = []) {
//Does the entity alread exists ?
$results = getAllDatasFromTable(
'glpi_entities',
- "`name`='$name' AND `entities_id`='$parent'"
+ ['name' => $name, 'entities_id' => $parent]
);
//Entity doesn't exists => create it
if (empty($results)) {
@@ -157,7 +157,7 @@ function customDataAlreadyInDB($injectionClass, $values, $options) {
}
$results = getAllDatasFromTable(
'glpi_entities',
- "`completename`='".$values['completename']."'"
+ ['completename' => $values['completename']]
);
if (empty($results)) {
diff --git a/inc/info.class.php b/inc/info.class.php
index 5c43bf69..a928f408 100644
--- a/inc/info.class.php
+++ b/inc/info.class.php
@@ -229,7 +229,7 @@ static function showAdditionalInformationsForm(PluginDatainjectionModel $model)
$infos = getAllDatasFromTable(
'glpi_plugin_datainjection_infos',
- "`models_id` = '". $model->getField('id')."'"
+ ['models_id' => $model->getField('id')]
);
$table = false;
diff --git a/inc/injectiontype.class.php b/inc/injectiontype.class.php
index 90066439..20f08cd3 100644
--- a/inc/injectiontype.class.php
+++ b/inc/injectiontype.class.php
@@ -351,7 +351,7 @@ static function getUsedMappingsOrInfos($options = []) {
$table = (($p['called_by'] == 'PluginDatainjectionMapping') ?"glpi_plugin_datainjection_mappings"
:"glpi_plugin_datainjection_infos");
- $datas = getAllDatasFromTable($table, "`models_id` = '".$mapping_or_info['models_id']."'");
+ $datas = getAllDatasFromTable($table, ['models_id' => $mapping_or_info['models_id']]);
$injectionClass = PluginDatainjectionCommonInjectionLib::getInjectionClassInstance($p['itemtype']);
$options = $injectionClass->getOptions();
diff --git a/inc/model.class.php b/inc/model.class.php
index 9c5486c8..92050d48 100644
--- a/inc/model.class.php
+++ b/inc/model.class.php
@@ -1403,6 +1403,15 @@ static function prepareLogResults($models_id) {
$tmp['item'] = $result[$model->fields['itemtype']];
$url = Toolbox::getItemTypeFormURL($model->fields['itemtype'])."?id=".
$result[$model->fields['itemtype']];
+ //redefine genericobject url of needed
+ $plugin = new Plugin();
+ if ($plugin->isActivated('genericobject')
+ && array_key_exists($model->fields['itemtype'], PluginGenericobjectType::getTypes())) {
+ global $CFG_GLPI;
+ $url = $CFG_GLPI['root_doc']."/plugins/genericobject/front/object.form.php".
+ "?itemtype=".$model->fields['itemtype']."&id=".$result[$model->fields['itemtype']];
+ }
+
$tmp['url'] = "".$result[$model->fields['itemtype']]."";
}
diff --git a/inc/networknameinjection.class.php b/inc/networknameinjection.class.php
index d47b8315..da026abf 100644
--- a/inc/networknameinjection.class.php
+++ b/inc/networknameinjection.class.php
@@ -112,9 +112,11 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
if (isset($values['NetworkName']['ipaddresses_id'])) {
if (!countElementsInTable(
"glpi_ipaddresses",
- "`items_id`='".$values['NetworkName']['id']."'
- AND `itemtype`='NetworkName'
- AND `name`='".$values['NetworkName']['ipaddresses_id']."'"
+ [
+ 'items_id' => $values['NetworkName']['id'],
+ 'itemtype' => 'NetworkName',
+ 'name' => $values['NetworkName']['ipaddresses_id'],
+ ]
)) {
$ip = new IPAddress();
diff --git a/inc/profile.class.php b/inc/profile.class.php
index ec409a68..e4a44eeb 100644
--- a/inc/profile.class.php
+++ b/inc/profile.class.php
@@ -96,7 +96,7 @@ static function addDefaultProfileInfos($profiles_id, $rights) {
foreach ($rights as $right => $value) {
if (!countElementsInTable(
'glpi_profilerights',
- "`profiles_id`='$profiles_id' AND `name`='$right'"
+ ['profiles_id' => $profiles_id, 'name' => $right]
)) {
$myright['profiles_id'] = $profiles_id;
$myright['name'] = $right;
diff --git a/inc/userinjection.class.php b/inc/userinjection.class.php
index be1a6a24..e9650953 100644
--- a/inc/userinjection.class.php
+++ b/inc/userinjection.class.php
@@ -153,8 +153,10 @@ function processAfterInsertOrUpdate($values, $add = true, $rights = []) {
if (!countElementsInTable(
"glpi_useremails",
- "`users_id`='".$values['User']['id']."'
- AND `email`='".$values['User']['useremails_id']."'"
+ [
+ 'users_id' => $values['User']['id'],
+ 'email' => $values['User']['useremails_id'],
+ ]
)) {
$useremail = new UserEmail();
$tmp['users_id'] = $values['User']['id'];
diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo
index a293dbc5..3e5873d3 100644
Binary files a/locales/cs_CZ.mo and b/locales/cs_CZ.mo differ
diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po
index 96f36432..36772e59 100644
--- a/locales/cs_CZ.po
+++ b/locales/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 09:54+0000\n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Cédric Anne, 2018\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n"
@@ -59,55 +59,55 @@ msgstr ""
msgid "Can't create folder"
msgstr "Složku není možné vytvořit"
-#: inc/commoninjectionlib.class.php:1876
+#: inc/commoninjectionlib.class.php:1870
msgid "Add from CSV file"
msgstr "Přidat z CSV souboru"
-#: inc/commoninjectionlib.class.php:1878
+#: inc/commoninjectionlib.class.php:1872
msgid "Update from CSV file"
msgstr "Aktualizovat z CSV souboru"
-#: inc/commoninjectionlib.class.php:1919
+#: inc/commoninjectionlib.class.php:1913
msgid "No right to import data"
msgstr "Nemáte oprávnění importovat data"
-#: inc/commoninjectionlib.class.php:1923
+#: inc/commoninjectionlib.class.php:1917
msgid "No right to update data"
msgstr "Nemáte oprávnění aktualizovat data"
-#: inc/commoninjectionlib.class.php:1927
+#: inc/commoninjectionlib.class.php:1921
msgid "Size of the inserted value is to expansive"
msgstr "Velikost vkládané hodnoty je příliš obsáhlá"
-#: inc/commoninjectionlib.class.php:1931
+#: inc/commoninjectionlib.class.php:1925
msgid "Import not allowed"
msgstr "Import není dovolen"
-#: inc/commoninjectionlib.class.php:1935
+#: inc/commoninjectionlib.class.php:1929
msgid "Import failed"
msgstr "Import se nezdařil"
-#: inc/commoninjectionlib.class.php:1939
+#: inc/commoninjectionlib.class.php:1933
msgid "At least one mandatory field is not present"
msgstr "Přinejmenším jedna povinná kolonka není vyplněná"
-#: inc/commoninjectionlib.class.php:1943
+#: inc/commoninjectionlib.class.php:1937
msgid "Data to insert are correct"
msgstr "Data pro vložení jsou v pořádku"
-#: inc/commoninjectionlib.class.php:1947
+#: inc/commoninjectionlib.class.php:1941
msgid "One data is not the good type"
msgstr "Jedna data nejsou správného typu"
-#: inc/commoninjectionlib.class.php:1951
+#: inc/commoninjectionlib.class.php:1945
msgid "Warning"
msgstr "Varování"
-#: inc/commoninjectionlib.class.php:1955
+#: inc/commoninjectionlib.class.php:1949
msgid "Data not found"
msgstr "Data nebyla nalezena"
-#: inc/commoninjectionlib.class.php:1959 inc/model.class.php:1369
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
msgid "Undetermined"
msgstr "Nespecifikováno"
diff --git a/locales/datainjection.pot b/locales/datainjection.pot
index 5489ff1f..c7ed0d18 100644
--- a/locales/datainjection.pot
+++ b/locales/datainjection.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 09:54+0000\n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -55,55 +55,55 @@ msgstr ""
msgid "Can't create folder"
msgstr ""
-#: inc/commoninjectionlib.class.php:1876
+#: inc/commoninjectionlib.class.php:1870
msgid "Add from CSV file"
msgstr ""
-#: inc/commoninjectionlib.class.php:1878
+#: inc/commoninjectionlib.class.php:1872
msgid "Update from CSV file"
msgstr ""
-#: inc/commoninjectionlib.class.php:1919
+#: inc/commoninjectionlib.class.php:1913
msgid "No right to import data"
msgstr ""
-#: inc/commoninjectionlib.class.php:1923
+#: inc/commoninjectionlib.class.php:1917
msgid "No right to update data"
msgstr ""
-#: inc/commoninjectionlib.class.php:1927
+#: inc/commoninjectionlib.class.php:1921
msgid "Size of the inserted value is to expansive"
msgstr ""
-#: inc/commoninjectionlib.class.php:1931
+#: inc/commoninjectionlib.class.php:1925
msgid "Import not allowed"
msgstr ""
-#: inc/commoninjectionlib.class.php:1935
+#: inc/commoninjectionlib.class.php:1929
msgid "Import failed"
msgstr ""
-#: inc/commoninjectionlib.class.php:1939
+#: inc/commoninjectionlib.class.php:1933
msgid "At least one mandatory field is not present"
msgstr ""
-#: inc/commoninjectionlib.class.php:1943
+#: inc/commoninjectionlib.class.php:1937
msgid "Data to insert are correct"
msgstr ""
-#: inc/commoninjectionlib.class.php:1947
+#: inc/commoninjectionlib.class.php:1941
msgid "One data is not the good type"
msgstr ""
-#: inc/commoninjectionlib.class.php:1951
+#: inc/commoninjectionlib.class.php:1945
msgid "Warning"
msgstr ""
-#: inc/commoninjectionlib.class.php:1955
+#: inc/commoninjectionlib.class.php:1949
msgid "Data not found"
msgstr ""
-#: inc/commoninjectionlib.class.php:1959 inc/model.class.php:1369
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
msgid "Undetermined"
msgstr ""
diff --git a/locales/en_GB.mo b/locales/en_GB.mo
index 0ec5d3a4..f81412cd 100644
Binary files a/locales/en_GB.mo and b/locales/en_GB.mo differ
diff --git a/locales/en_GB.po b/locales/en_GB.po
index c38b1429..caf7f1fa 100644
--- a/locales/en_GB.po
+++ b/locales/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 09:54+0000\n"
-"PO-Revision-Date: 2018-06-28 09:54+0000\n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
+"PO-Revision-Date: 2018-08-21 14:46+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en_GB\n"
@@ -58,55 +58,55 @@ msgstr ""
msgid "Can't create folder"
msgstr "Can't create folder"
-#: inc/commoninjectionlib.class.php:1876
+#: inc/commoninjectionlib.class.php:1870
msgid "Add from CSV file"
msgstr "Add from CSV file"
-#: inc/commoninjectionlib.class.php:1878
+#: inc/commoninjectionlib.class.php:1872
msgid "Update from CSV file"
msgstr "Update from CSV file"
-#: inc/commoninjectionlib.class.php:1919
+#: inc/commoninjectionlib.class.php:1913
msgid "No right to import data"
msgstr "No right to import data"
-#: inc/commoninjectionlib.class.php:1923
+#: inc/commoninjectionlib.class.php:1917
msgid "No right to update data"
msgstr "No right to update data"
-#: inc/commoninjectionlib.class.php:1927
+#: inc/commoninjectionlib.class.php:1921
msgid "Size of the inserted value is to expansive"
msgstr "Size of the inserted value is to expansive"
-#: inc/commoninjectionlib.class.php:1931
+#: inc/commoninjectionlib.class.php:1925
msgid "Import not allowed"
msgstr "Import not allowed"
-#: inc/commoninjectionlib.class.php:1935
+#: inc/commoninjectionlib.class.php:1929
msgid "Import failed"
msgstr "Import failed"
-#: inc/commoninjectionlib.class.php:1939
+#: inc/commoninjectionlib.class.php:1933
msgid "At least one mandatory field is not present"
msgstr "At least one mandatory field is not present"
-#: inc/commoninjectionlib.class.php:1943
+#: inc/commoninjectionlib.class.php:1937
msgid "Data to insert are correct"
msgstr "Data to insert are correct"
-#: inc/commoninjectionlib.class.php:1947
+#: inc/commoninjectionlib.class.php:1941
msgid "One data is not the good type"
msgstr "One data is not the good type"
-#: inc/commoninjectionlib.class.php:1951
+#: inc/commoninjectionlib.class.php:1945
msgid "Warning"
msgstr "Warning"
-#: inc/commoninjectionlib.class.php:1955
+#: inc/commoninjectionlib.class.php:1949
msgid "Data not found"
msgstr "Data not found"
-#: inc/commoninjectionlib.class.php:1959 inc/model.class.php:1369
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
msgid "Undetermined"
msgstr "Undetermined"
diff --git a/locales/fi_FI.mo b/locales/fi_FI.mo
index cea09f95..db0a4de3 100644
Binary files a/locales/fi_FI.mo and b/locales/fi_FI.mo differ
diff --git a/locales/fi_FI.po b/locales/fi_FI.po
index d63b9181..c2bbdd04 100644
--- a/locales/fi_FI.po
+++ b/locales/fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 09:54+0000\n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Cédric Anne, 2018\n"
"Language-Team: Finnish (Finland) (https://www.transifex.com/teclib/teams/28042/fi_FI/)\n"
@@ -59,55 +59,55 @@ msgstr ""
msgid "Can't create folder"
msgstr "Kansioa ei voi luoda"
-#: inc/commoninjectionlib.class.php:1876
+#: inc/commoninjectionlib.class.php:1870
msgid "Add from CSV file"
msgstr "Lisää CSV-tiedostosta"
-#: inc/commoninjectionlib.class.php:1878
+#: inc/commoninjectionlib.class.php:1872
msgid "Update from CSV file"
msgstr "Päivitä CSV-tiedostosta"
-#: inc/commoninjectionlib.class.php:1919
+#: inc/commoninjectionlib.class.php:1913
msgid "No right to import data"
msgstr "Ei oikeutta tuoda tietoja"
-#: inc/commoninjectionlib.class.php:1923
+#: inc/commoninjectionlib.class.php:1917
msgid "No right to update data"
msgstr "Ei oikeutta päivittää tietoja"
-#: inc/commoninjectionlib.class.php:1927
+#: inc/commoninjectionlib.class.php:1921
msgid "Size of the inserted value is to expansive"
msgstr "Syötetyn arvo koko laajeneva"
-#: inc/commoninjectionlib.class.php:1931
+#: inc/commoninjectionlib.class.php:1925
msgid "Import not allowed"
msgstr "Tuonti ei sallittu"
-#: inc/commoninjectionlib.class.php:1935
+#: inc/commoninjectionlib.class.php:1929
msgid "Import failed"
msgstr "Tuonti epäonnistui"
-#: inc/commoninjectionlib.class.php:1939
+#: inc/commoninjectionlib.class.php:1933
msgid "At least one mandatory field is not present"
msgstr "Ainakin yksi pakollinen kenttä puuttuu"
-#: inc/commoninjectionlib.class.php:1943
+#: inc/commoninjectionlib.class.php:1937
msgid "Data to insert are correct"
msgstr "Syötetyt tiedot ovat oikeita"
-#: inc/commoninjectionlib.class.php:1947
+#: inc/commoninjectionlib.class.php:1941
msgid "One data is not the good type"
msgstr "Yksi tieto ei ole oikeaa tyyppiä"
-#: inc/commoninjectionlib.class.php:1951
+#: inc/commoninjectionlib.class.php:1945
msgid "Warning"
msgstr "Varoitus"
-#: inc/commoninjectionlib.class.php:1955
+#: inc/commoninjectionlib.class.php:1949
msgid "Data not found"
msgstr "Tietoja ei löytynyt"
-#: inc/commoninjectionlib.class.php:1959 inc/model.class.php:1369
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
msgid "Undetermined"
msgstr "Määrittelemätön"
diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo
index 362b303b..d6adeb69 100644
Binary files a/locales/fr_FR.mo and b/locales/fr_FR.mo differ
diff --git a/locales/fr_FR.po b/locales/fr_FR.po
index e47b3138..2d794252 100644
--- a/locales/fr_FR.po
+++ b/locales/fr_FR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 09:54+0000\n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Cédric Anne, 2018\n"
"Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n"
@@ -59,55 +59,55 @@ msgstr ""
msgid "Can't create folder"
msgstr "Impossible de créer le dossier"
-#: inc/commoninjectionlib.class.php:1876
+#: inc/commoninjectionlib.class.php:1870
msgid "Add from CSV file"
msgstr "Ajout depuis le fichier CSV"
-#: inc/commoninjectionlib.class.php:1878
+#: inc/commoninjectionlib.class.php:1872
msgid "Update from CSV file"
msgstr "Mis à jour depuis le fichier CSV"
-#: inc/commoninjectionlib.class.php:1919
+#: inc/commoninjectionlib.class.php:1913
msgid "No right to import data"
msgstr "Vous n'avez pas les droits nécessaires pour importer des données"
-#: inc/commoninjectionlib.class.php:1923
+#: inc/commoninjectionlib.class.php:1917
msgid "No right to update data"
msgstr "Vous n'avez pas les droits nécessaires pour mettre à jour des données"
-#: inc/commoninjectionlib.class.php:1927
+#: inc/commoninjectionlib.class.php:1921
msgid "Size of the inserted value is to expansive"
msgstr "Le nombre de valeurs à insérer est trop important"
-#: inc/commoninjectionlib.class.php:1931
+#: inc/commoninjectionlib.class.php:1925
msgid "Import not allowed"
msgstr "Import interdit"
-#: inc/commoninjectionlib.class.php:1935
+#: inc/commoninjectionlib.class.php:1929
msgid "Import failed"
msgstr "Import impossible"
-#: inc/commoninjectionlib.class.php:1939
+#: inc/commoninjectionlib.class.php:1933
msgid "At least one mandatory field is not present"
msgstr "Au moins un champ obligatoire n'est pas rempli"
-#: inc/commoninjectionlib.class.php:1943
+#: inc/commoninjectionlib.class.php:1937
msgid "Data to insert are correct"
msgstr "Les données à importer sont valides"
-#: inc/commoninjectionlib.class.php:1947
+#: inc/commoninjectionlib.class.php:1941
msgid "One data is not the good type"
msgstr "Au moins une donnée n'a pas le bon format / type"
-#: inc/commoninjectionlib.class.php:1951
+#: inc/commoninjectionlib.class.php:1945
msgid "Warning"
msgstr "Attention"
-#: inc/commoninjectionlib.class.php:1955
+#: inc/commoninjectionlib.class.php:1949
msgid "Data not found"
msgstr "Donnée introuvable"
-#: inc/commoninjectionlib.class.php:1959 inc/model.class.php:1369
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
msgid "Undetermined"
msgstr "Indéterminé"
diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo
index 354fd1d3..e66af78d 100644
Binary files a/locales/pt_BR.mo and b/locales/pt_BR.mo differ
diff --git a/locales/pt_BR.po b/locales/pt_BR.po
index 86b0c71a..d1d4c177 100644
--- a/locales/pt_BR.po
+++ b/locales/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 09:54+0000\n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Cédric Anne, 2018\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/teclib/teams/28042/pt_BR/)\n"
@@ -60,55 +60,55 @@ msgstr ""
msgid "Can't create folder"
msgstr "Não é possível criar a pasta"
-#: inc/commoninjectionlib.class.php:1876
+#: inc/commoninjectionlib.class.php:1870
msgid "Add from CSV file"
msgstr "Adicionar de arquivo CSV"
-#: inc/commoninjectionlib.class.php:1878
+#: inc/commoninjectionlib.class.php:1872
msgid "Update from CSV file"
msgstr "Atualizar com arquivo CSV"
-#: inc/commoninjectionlib.class.php:1919
+#: inc/commoninjectionlib.class.php:1913
msgid "No right to import data"
msgstr "Sem direitos para importação dos dados"
-#: inc/commoninjectionlib.class.php:1923
+#: inc/commoninjectionlib.class.php:1917
msgid "No right to update data"
msgstr "Sem direitos para atualização dos dados"
-#: inc/commoninjectionlib.class.php:1927
+#: inc/commoninjectionlib.class.php:1921
msgid "Size of the inserted value is to expansive"
msgstr "O tamanho do valor inserido é expansivo"
-#: inc/commoninjectionlib.class.php:1931
+#: inc/commoninjectionlib.class.php:1925
msgid "Import not allowed"
msgstr "Importação não permitida"
-#: inc/commoninjectionlib.class.php:1935
+#: inc/commoninjectionlib.class.php:1929
msgid "Import failed"
msgstr "Falha na importação"
-#: inc/commoninjectionlib.class.php:1939
+#: inc/commoninjectionlib.class.php:1933
msgid "At least one mandatory field is not present"
msgstr "Pelo menos um dos campos obrigatórios não está presente, verifique"
-#: inc/commoninjectionlib.class.php:1943
+#: inc/commoninjectionlib.class.php:1937
msgid "Data to insert are correct"
msgstr "Dados para importação estão corretos"
-#: inc/commoninjectionlib.class.php:1947
+#: inc/commoninjectionlib.class.php:1941
msgid "One data is not the good type"
msgstr "Um dado não está de acordo"
-#: inc/commoninjectionlib.class.php:1951
+#: inc/commoninjectionlib.class.php:1945
msgid "Warning"
msgstr "Aviso"
-#: inc/commoninjectionlib.class.php:1955
+#: inc/commoninjectionlib.class.php:1949
msgid "Data not found"
msgstr "Dados não encontrados"
-#: inc/commoninjectionlib.class.php:1959 inc/model.class.php:1369
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
msgid "Undetermined"
msgstr "Impossível determinar"
diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo
index 5636c166..2c0c2ba5 100644
Binary files a/locales/ru_RU.mo and b/locales/ru_RU.mo differ
diff --git a/locales/ru_RU.po b/locales/ru_RU.po
index c1bdcdae..e75c6a4b 100644
--- a/locales/ru_RU.po
+++ b/locales/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 09:54+0000\n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Pavlo Lacenko , 2018\n"
"Language-Team: Russian (Russia) (https://www.transifex.com/teclib/teams/28042/ru_RU/)\n"
@@ -55,55 +55,55 @@ msgstr ""
msgid "Can't create folder"
msgstr "Невозможно создать папку"
-#: inc/commoninjectionlib.class.php:1876
+#: inc/commoninjectionlib.class.php:1870
msgid "Add from CSV file"
msgstr "Добавить из CSV файла"
-#: inc/commoninjectionlib.class.php:1878
+#: inc/commoninjectionlib.class.php:1872
msgid "Update from CSV file"
msgstr "Обновить из CSV файла"
-#: inc/commoninjectionlib.class.php:1919
+#: inc/commoninjectionlib.class.php:1913
msgid "No right to import data"
msgstr "Нет прав для импорта"
-#: inc/commoninjectionlib.class.php:1923
+#: inc/commoninjectionlib.class.php:1917
msgid "No right to update data"
msgstr "Нет прав для обновления"
-#: inc/commoninjectionlib.class.php:1927
+#: inc/commoninjectionlib.class.php:1921
msgid "Size of the inserted value is to expansive"
msgstr ""
-#: inc/commoninjectionlib.class.php:1931
+#: inc/commoninjectionlib.class.php:1925
msgid "Import not allowed"
msgstr "Импорт не разрешен"
-#: inc/commoninjectionlib.class.php:1935
+#: inc/commoninjectionlib.class.php:1929
msgid "Import failed"
msgstr ""
-#: inc/commoninjectionlib.class.php:1939
+#: inc/commoninjectionlib.class.php:1933
msgid "At least one mandatory field is not present"
msgstr ""
-#: inc/commoninjectionlib.class.php:1943
+#: inc/commoninjectionlib.class.php:1937
msgid "Data to insert are correct"
msgstr ""
-#: inc/commoninjectionlib.class.php:1947
+#: inc/commoninjectionlib.class.php:1941
msgid "One data is not the good type"
msgstr ""
-#: inc/commoninjectionlib.class.php:1951
+#: inc/commoninjectionlib.class.php:1945
msgid "Warning"
msgstr "Предупреждение"
-#: inc/commoninjectionlib.class.php:1955
+#: inc/commoninjectionlib.class.php:1949
msgid "Data not found"
msgstr "Данные не найдены"
-#: inc/commoninjectionlib.class.php:1959 inc/model.class.php:1369
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
msgid "Undetermined"
msgstr ""
diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo
index 7707c244..22197b03 100644
Binary files a/locales/tr_TR.mo and b/locales/tr_TR.mo differ
diff --git a/locales/tr_TR.po b/locales/tr_TR.po
index c80e0f0b..a84fdc42 100644
--- a/locales/tr_TR.po
+++ b/locales/tr_TR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 09:54+0000\n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Cédric Anne, 2018\n"
"Language-Team: Turkish (Turkey) (https://www.transifex.com/teclib/teams/28042/tr_TR/)\n"
@@ -59,55 +59,55 @@ msgstr ""
msgid "Can't create folder"
msgstr "Klasör oluşturulamadı"
-#: inc/commoninjectionlib.class.php:1876
+#: inc/commoninjectionlib.class.php:1870
msgid "Add from CSV file"
msgstr "CSV dosyasından ekle"
-#: inc/commoninjectionlib.class.php:1878
+#: inc/commoninjectionlib.class.php:1872
msgid "Update from CSV file"
msgstr "CSV dosyasından güncelle"
-#: inc/commoninjectionlib.class.php:1919
+#: inc/commoninjectionlib.class.php:1913
msgid "No right to import data"
msgstr "Veri alma izni yok"
-#: inc/commoninjectionlib.class.php:1923
+#: inc/commoninjectionlib.class.php:1917
msgid "No right to update data"
msgstr "Veri güncelleme izni yok"
-#: inc/commoninjectionlib.class.php:1927
+#: inc/commoninjectionlib.class.php:1921
msgid "Size of the inserted value is to expansive"
msgstr "Eklenen değerin boyutu çok genişleyebilir"
-#: inc/commoninjectionlib.class.php:1931
+#: inc/commoninjectionlib.class.php:1925
msgid "Import not allowed"
msgstr "Alma işlemine izin verilmiyor"
-#: inc/commoninjectionlib.class.php:1935
+#: inc/commoninjectionlib.class.php:1929
msgid "Import failed"
msgstr "Alma işlemi yapılamadı"
-#: inc/commoninjectionlib.class.php:1939
+#: inc/commoninjectionlib.class.php:1933
msgid "At least one mandatory field is not present"
msgstr "En az bir zorunlu alan bulunamadı"
-#: inc/commoninjectionlib.class.php:1943
+#: inc/commoninjectionlib.class.php:1937
msgid "Data to insert are correct"
msgstr "Eklenecek veri doğru"
-#: inc/commoninjectionlib.class.php:1947
+#: inc/commoninjectionlib.class.php:1941
msgid "One data is not the good type"
msgstr "Bir verinin türü iyi değil"
-#: inc/commoninjectionlib.class.php:1951
+#: inc/commoninjectionlib.class.php:1945
msgid "Warning"
msgstr "Uyarı"
-#: inc/commoninjectionlib.class.php:1955
+#: inc/commoninjectionlib.class.php:1949
msgid "Data not found"
msgstr "Veri bulunamadı"
-#: inc/commoninjectionlib.class.php:1959 inc/model.class.php:1369
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
msgid "Undetermined"
msgstr "Belirlenmemiş"
diff --git a/locales/zh_CN.mo b/locales/zh_CN.mo
new file mode 100644
index 00000000..a224ed9f
Binary files /dev/null and b/locales/zh_CN.mo differ
diff --git a/locales/zh_CN.po b/locales/zh_CN.po
new file mode 100644
index 00000000..821836f5
--- /dev/null
+++ b/locales/zh_CN.po
@@ -0,0 +1,459 @@
+# 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 , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-21 14:46+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: liAnGjiA , 2018\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/teclib/teams/28042/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: front/model.form.php:88 front/clientinjection.form.php:83
+msgid "The file could not be found"
+msgstr "文件未找到"
+
+#: front/clientinjection.form.php:34 inc/profile.class.php:67
+#: inc/menu.class.php:38 setup.php:94
+msgid "File injection"
+msgstr "文件注入"
+
+#: front/clientinjection.form.php:50
+msgid "One mandatory field is not filled"
+msgstr "一个必填字段没有填"
+
+#: front/popup.php:37 inc/mapping.class.php:117
+msgid "See the file"
+msgstr "查看文件"
+
+#: front/popup.php:43 inc/model.class.php:1508
+msgid "File injection report"
+msgstr "文件注入报告"
+
+#: front/mapping.form.php:60
+msgid ""
+"One link field must be selected: it will be used to check if data already "
+"exists"
+msgstr " 必须选择一个关联字段：它将用于检查数据是否已经存在。 "
+
+#: front/mapping.form.php:76
+msgid ""
+"This step allows you to add informations not present in the file. You'll be "
+"asked for theses informations while using the model."
+msgstr " 此步骤允许您添加文件中不存在的信息。在使用该模型时，会要求您提供这些信息。 "
+
+#: hook.php:124 hook.php:141 setup.php:63
+msgid "Can't create folder"
+msgstr "无法创建文件夹"
+
+#: inc/commoninjectionlib.class.php:1870
+msgid "Add from CSV file"
+msgstr "从CSV文件添加"
+
+#: inc/commoninjectionlib.class.php:1872
+msgid "Update from CSV file"
+msgstr "从CSV文件更新"
+
+#: inc/commoninjectionlib.class.php:1913
+msgid "No right to import data"
+msgstr "无权导入数据"
+
+#: inc/commoninjectionlib.class.php:1917
+msgid "No right to update data"
+msgstr "无权更新数据"
+
+#: inc/commoninjectionlib.class.php:1921
+msgid "Size of the inserted value is to expansive"
+msgstr ""
+
+#: inc/commoninjectionlib.class.php:1925
+msgid "Import not allowed"
+msgstr "禁止导入"
+
+#: inc/commoninjectionlib.class.php:1929
+msgid "Import failed"
+msgstr "导入失败"
+
+#: inc/commoninjectionlib.class.php:1933
+msgid "At least one mandatory field is not present"
+msgstr "至少有一个必填字段还没有"
+
+#: inc/commoninjectionlib.class.php:1937
+msgid "Data to insert are correct"
+msgstr "插入数据正确"
+
+#: inc/commoninjectionlib.class.php:1941
+msgid "One data is not the good type"
+msgstr "一个数据类型不对"
+
+#: inc/commoninjectionlib.class.php:1945
+msgid "Warning"
+msgstr "警告"
+
+#: inc/commoninjectionlib.class.php:1949
+msgid "Data not found"
+msgstr "数据未找到"
+
+#: inc/commoninjectionlib.class.php:1953 inc/model.class.php:1369
+msgid "Undetermined"
+msgstr " 未确定的"
+
+#: inc/profile.class.php:40 inc/model.class.php:75
+msgid "Model management"
+msgstr "模型管理"
+
+#: inc/profile.class.php:43 inc/menu.class.php:58 inc/menu.class.php:59
+#: inc/clientinjection.class.php:214
+msgid "Injection of the file"
+msgstr "文件注入"
+
+#: inc/webservice.class.php:78
+msgid "Model unknown"
+msgstr "未知模型"
+
+#: inc/webservice.class.php:86 inc/webservice.class.php:95
+msgid "You cannot access this model"
+msgstr "您无权访问此模型"
+
+#: inc/webservice.class.php:115
+msgid "Entity unknown"
+msgstr "未知实体"
+
+#: inc/webservice.class.php:123
+msgid "You cannot access this entity"
+msgstr "您无权访问此实体"
+
+#: inc/clientinjection.class.php:88
+msgid "Use an existing model"
+msgstr "使用一个存在的模型"
+
+#: inc/clientinjection.class.php:96
+msgid "No model currently available"
+msgstr "当前没有可用的模型"
+
+#: inc/clientinjection.class.php:105
+msgid "You can start the model creation by hitting the button"
+msgstr "您可以通过点击按钮开始模型创建"
+
+#: inc/clientinjection.class.php:153 inc/model.class.php:769
+#: inc/dropdown.class.php:87
+msgid "File to inject"
+msgstr "文件注入"
+
+#: inc/clientinjection.class.php:156 inc/info.class.php:247
+msgid "Choose a file"
+msgstr "选择文件"
+
+#: inc/clientinjection.class.php:162
+msgid "File encoding"
+msgstr "文件编码"
+
+#: inc/clientinjection.class.php:170
+msgid "Warning : existing data will be overridden"
+msgstr "警告：已有数据将会被覆盖掉"
+
+#: inc/clientinjection.class.php:173
+msgid ""
+"Watch out, you're about to inject data into GLPI. Are you sure you want to "
+"do it ?"
+msgstr "当心了，您将有往GLPI里注入数据。您确定要这样做么？"
+
+#: inc/clientinjection.class.php:180
+msgid "Launch the import"
+msgstr "启动导入"
+
+#: inc/clientinjection.class.php:210
+msgid "Import progress"
+msgstr "导入进度"
+
+#: inc/clientinjection.class.php:280
+#, php-format
+msgid "Injection of the file... %d%%"
+msgstr "注入文件... %d%%"
+
+#: inc/clientinjection.class.php:297
+msgid "Injection finished"
+msgstr "注入完成"
+
+#: inc/clientinjection.class.php:369
+msgid "Injection's results"
+msgstr "注入结果"
+
+#: inc/clientinjection.class.php:374
+msgid "Injection successful"
+msgstr "注入成功"
+
+#: inc/clientinjection.class.php:377
+msgid "Injection encounters errors"
+msgstr "注入遇到错误"
+
+#: inc/clientinjection.class.php:386
+msgid "See the log"
+msgstr "查看日志"
+
+#: inc/clientinjection.class.php:392
+msgid "Export rapport in PDF"
+msgstr "导出PDF报表"
+
+#: inc/clientinjection.class.php:398
+msgid "Export the log"
+msgstr "导出日志"
+
+#: inc/clientinjection.class.php:406
+msgid "Finish"
+msgstr "完成"
+
+#: inc/model.class.php:383 inc/model.class.php:669
+msgid "Allow lines creation"
+msgstr ""
+
+#: inc/model.class.php:392 inc/model.class.php:672
+msgid "Allow lines update"
+msgstr ""
+
+#: inc/model.class.php:401 inc/model.class.php:657
+msgid "Type of data to import"
+msgstr "导入数据类型"
+
+#: inc/model.class.php:411 inc/model.class.php:681
+msgid "Allow creation of dropdowns"
+msgstr ""
+
+#: inc/model.class.php:419 inc/model.class.php:685
+msgid "Dates format"
+msgstr "数据格式"
+
+#: inc/model.class.php:428 inc/model.class.php:698
+msgid "Float format"
+msgstr "浮点格式"
+
+#: inc/model.class.php:438 inc/model.class.php:707
+msgid "Try to establish network connection is possible"
+msgstr ""
+
+#: inc/model.class.php:448 inc/model.class.php:711
+msgid "Port unicity criteria"
+msgstr ""
+
+#: inc/model.class.php:677
+msgid "Advanced options"
+msgstr "高级选项"
+
+#: inc/model.class.php:694
+msgid "Allow update of existing fields"
+msgstr ""
+
+#: inc/model.class.php:737
+msgctxt "button"
+msgid "Validate the model"
+msgstr "无效模型"
+
+#: inc/model.class.php:771 inc/dropdown.class.php:88
+msgid "Mappings"
+msgstr ""
+
+#: inc/model.class.php:774 inc/dropdown.class.php:90
+msgid "Additional Information"
+msgstr ""
+
+#: inc/model.class.php:802
+msgid "Load this file"
+msgstr "加载此文件"
+
+#: inc/model.class.php:881
+msgid "Please enter a name for the model"
+msgstr "请给模型命名"
+
+#: inc/model.class.php:890
+msgid "Your model should allow import and/or update of data"
+msgstr ""
+
+#: inc/model.class.php:909
+msgid "You are not the initial creator of this model"
+msgstr ""
+
+#: inc/model.class.php:972
+#, php-format
+msgid "Impossible to copy the file in %s"
+msgstr ""
+
+#: inc/model.class.php:980
+msgid "File format is wrong"
+msgstr "文件格式错误"
+
+#: inc/model.class.php:981
+msgid "Extension csv required"
+msgstr ""
+
+#: inc/model.class.php:1058
+msgid "Not data to import"
+msgstr "无数据导入"
+
+#: inc/model.class.php:1118
+msgid "The file is ok."
+msgstr "文件没问题。"
+
+#: inc/model.class.php:1143
+msgid "The number of columns of the file is incorrect."
+msgstr ""
+
+#: inc/model.class.php:1145
+#, php-format
+msgid "%d awaited column"
+msgid_plural "%d awaited columns"
+msgstr[0] ""
+
+#: inc/model.class.php:1150
+#, php-format
+msgid "%d found column"
+msgid_plural "%d found columns"
+msgstr[0] ""
+
+#: inc/model.class.php:1190
+msgid "At least one column is incorrect"
+msgstr ""
+
+#: inc/model.class.php:1198
+msgid "Into the file"
+msgstr ""
+
+#: inc/model.class.php:1203
+msgid "From the model"
+msgstr ""
+
+#: inc/model.class.php:1434 inc/model.class.php:1517
+msgid "Array of successful injections"
+msgstr ""
+
+#: inc/model.class.php:1441 inc/model.class.php:1471 inc/model.class.php:1520
+#: inc/model.class.php:1540
+msgid "Line"
+msgstr ""
+
+#: inc/model.class.php:1442 inc/model.class.php:1473 inc/model.class.php:1521
+#: inc/model.class.php:1542
+msgid "Data Import"
+msgstr "数据导入"
+
+#: inc/model.class.php:1443 inc/model.class.php:1474 inc/model.class.php:1522
+#: inc/model.class.php:1543
+msgid "Injection type"
+msgstr "注入类型"
+
+#: inc/model.class.php:1444 inc/model.class.php:1475 inc/model.class.php:1523
+#: inc/model.class.php:1544
+msgid "Object Identifier"
+msgstr ""
+
+#: inc/model.class.php:1464 inc/model.class.php:1537
+msgid "Array of unsuccessful injections"
+msgstr ""
+
+#: inc/model.class.php:1472 inc/model.class.php:1541 inc/model.class.php:1558
+msgid "Data check"
+msgstr "数据检查"
+
+#: inc/injectiontype.class.php:131
+msgid "-------Choose a table-------"
+msgstr "-------选择表-------"
+
+#: inc/injectiontype.class.php:192
+msgid "-------Choose a field-------"
+msgstr "-------选择字段-------"
+
+#: inc/networkequipmentinjection.class.php:72
+msgid "Number of ports"
+msgstr "端口号"
+
+#: inc/mapping.class.php:123
+msgid "Header of the file"
+msgstr "文件头"
+
+#: inc/mapping.class.php:124 inc/info.class.php:84 inc/info.class.php:141
+msgid "Tables"
+msgstr "表"
+
+#: inc/mapping.class.php:126
+msgid "Link field"
+msgstr "关联字段"
+
+#: inc/info.class.php:86 inc/info.class.php:143
+msgid "Mandatory information"
+msgstr "必填信息"
+
+#: inc/info.class.php:142
+msgid "Fields"
+msgstr "字段"
+
+#: inc/info.class.php:246
+msgid "Complementary information"
+msgstr "补充信息"
+
+#: inc/info.class.php:256
+msgid "Download file sample"
+msgstr "下载示例文件"
+
+#: inc/dropdown.class.php:37
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: inc/dropdown.class.php:39
+msgid "mm-dd-yyyy"
+msgstr "mm-dd-yyyy"
+
+#: inc/dropdown.class.php:41
+msgid "yyyy-mm-dd"
+msgstr "yyyy-mm-dd"
+
+#: inc/dropdown.class.php:60
+msgid "1 234.56"
+msgstr "1 234.56"
+
+#: inc/dropdown.class.php:62
+msgid "1 234,56"
+msgstr "1 234,56"
+
+#: inc/dropdown.class.php:64
+msgid "1,234.56"
+msgstr "1,234.56"
+
+#: inc/dropdown.class.php:94
+msgid "Model available for use"
+msgstr "可供使用的模型"
+
+#: inc/dropdown.class.php:119
+msgid "Automatic detection"
+msgstr "自动检测"
+
+#: inc/dropdown.class.php:122
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: inc/dropdown.class.php:123
+msgid "ISO8859-1"
+msgstr "ISO8859-1"
+
+#: inc/modelcsv.class.php:160
+msgid "Specific file format options"
+msgstr "特殊格式选项"
+
+#: inc/modelcsv.class.php:163
+msgid "Header's presence"
+msgstr ""
+
+#: inc/modelcsv.class.php:167
+msgid "File delimitor"
+msgstr "文件分隔符"
+
+#: inc/networkportinjection.class.php:89
+msgid "Port MAC address"
+msgstr "MAC地址端口"
diff --git a/setup.php b/setup.php
index c2ddb4b9..17cdfa9f 100644
--- a/setup.php
+++ b/setup.php
@@ -28,7 +28,7 @@
@since 2009
---------------------------------------------------------------------- */
-define ('PLUGIN_DATAINJECTION_VERSION', '2.6.1');
+define ('PLUGIN_DATAINJECTION_VERSION', '2.6.2');
// Minimal GLPI version, inclusive
define("PLUGIN_DATAINJECTION_MIN_GLPI", "9.3");